ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,972 Commits 115 Branches 0 Tags 13 MiB
c3c493dc48
Commit Graph

56 Commits

Author SHA1 Message Date
Brett Sun
d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Tim Daubenschütz
68b608763a Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow 
Conflicts:
	js/components/header.js
	js/utils/head_setter.js
 2015-10-22 12:00:59 +02:00
Tim Daubenschütz
0655955027 Remove Source Sans Pro as its not being used anymore 2015-10-21 10:52:52 +02:00
Tim Daubenschütz
2b00bfeb4f Revert "Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity" 
Remove AD-756 from PR

This reverts commit 097e158e50, reversing
changes made to 6175775503.

Conflicts:
	js/components/header.js
 2015-10-14 17:41:44 +02:00
diminator
097e158e50 Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/header.js
 2015-10-13 11:39:20 +02:00
Cevo
1d94285346 meta removed from index.html 2015-10-09 10:38:58 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
diminator
71988d502d ascribe fonts 
first cut layout

spinner
 2015-10-08 11:12:15 +02:00
Cevo
d66d80e229 real logo of ikono added 2015-10-05 14:02:02 +02:00
Cevo
526bed6029 favicons working, ikonotv has to be modified to original ikonotv 2015-10-05 11:32:57 +02:00
Cevo
244c59d8e5 trying favico.js package 2015-10-05 10:16:48 +02:00
vrde
4d93e076df Add third party modules to handle tracking without polluting the code 2015-07-27 18:06:02 +02:00
Tim Daubenschütz
68dba56a21 refactor some scss variables and include css source map only in debug 2015-07-20 10:52:12 +02:00
Tim Daubenschütz
d0e5fe50cb fullscreen on add to homescreen and green navbar 2015-07-18 00:23:33 +02:00
Tim Daubenschütz
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +02:00
Tim Daubenschütz
13e151e83b add logging and responsive user navigation 2015-07-16 19:12:18 +02:00
Tim Daubenschütz
0ce2794608 disable raven 2015-07-16 17:06:25 +02:00
Tim Daubenschütz
f12d2273d5 fix csrftoken cookie issue 2015-07-16 17:04:37 +02:00
vrde
c1137f746d Remove http from font import 2015-07-15 18:47:11 +02:00
vrde
9e7e9782d6 Add google analytics 2015-07-15 01:45:03 +02:00
Tim Daubenschütz
d183b9ba1c include intercom 2015-07-14 21:47:14 +02:00
Tim Daubenschütz
e49b920318 more styling on the landing page 2015-07-14 18:34:46 +02:00
Tim Daubenschütz
73ab401257 add fav icons 2015-07-14 12:19:31 +02:00
vrde
3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
Tim Daubenschütz
f04ab169d6 fix endpoint bug 2015-06-24 18:02:32 +02:00
ddejongh
a302594043 test 2015-06-23 14:15:47 +02:00
ddejongh
e1dbc0e183 Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 14:05:56 +02:00
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00
vrde
05b9792d3f Add some new constants to the app 2015-06-10 17:28:36 +02:00
vrde
b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
vrde
5445698eea [wip] add temporary base url 2015-06-09 16:10:25 +02:00
Tim Daubenschütz
669f2b3ae7 resolve merge conflict 2015-06-09 13:38:01 +02:00
Tim Daubenschütz
e0e75151e0 add first working prototype 2015-06-08 18:14:25 +02:00
vrde
a1bfbb8f86 [wip] add server to serve app 2015-06-08 15:24:58 +02:00
Tim Daubenschütz
7f82d49278 resolve merge 2015-06-05 14:29:37 +02:00
Tim Daubenschütz
b4076aeef7 code styling 2015-06-03 10:45:23 +02:00
Tim Daubenschütz
95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
vrde
141d21155b WIP to style widgets, will continue later 2015-06-02 13:44:50 +02:00
Tim Daubenschütz
713dd72b2b add unfinished filtering widget 2015-06-02 11:40:55 +02:00
ddejongh
3f9f133224 Merge remote-tracking branches 'remotes/origin/AD-51-refactor-table-to-mockup' and 'remotes/origin/piece-detail-mediaplayer' into piece-detail-setup 2015-06-01 15:58:37 +02:00
Tim Daubenschütz
8a18d894cc add clear selection functionality 2015-06-01 15:12:31 +02:00
ddejongh
d90a4f97db loan 2015-06-01 13:02:53 +02:00
Tim Daubenschütz
fe78f30dc8 remove cdn bootstrap and integrate bootstrap-sass. PLZ DO NPM INSTALL 2015-05-29 12:02:37 +02:00
Tim Daubenschütz
21bb8bf97f remove jquery and bootstrap 2015-05-29 11:57:53 +02:00
Tim Daubenschütz
78d61dd1d6 integrate libsass and refactoring css files 2015-05-29 11:45:10 +02:00
ddejongh
8624eb26c7 sharemodal view 2015-05-27 09:34:49 +02:00
ddejongh
230ecfb0e4 modal try 1 2015-05-26 16:46:02 +02:00
Tim Daubenschütz
a4a4482d18 start implementing sort 2015-05-20 19:19:57 +02:00
Tim Daubenschütz
8c39335f3d Some styling 2015-05-20 17:32:06 +02:00