1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-30 13:41:57 +02:00
Commit Graph

286 Commits

Author SHA1 Message Date
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
Tim Daubenschütz
6e7037e5f2 Finish implementing refactor for open and close for edition lists 2015-06-15 09:29:34 +02:00
Tim Daubenschütz
989b121678 Fix mangling issue 2015-06-15 08:44:44 +02:00
root
9cc70dc4c9 refactor open state of edition table first cut 2015-06-12 17:18:40 +02:00
Tim Daubenschütz
d41f5df3ee separat ascribe-table css 2015-06-12 15:42:43 +02:00
Tim Daubenschütz
2bb004d2fb remove edition list count in table 2015-06-12 15:00:26 +02:00
Tim Daubenschütz
87bc6b3559 fix checkbox in edition list 2015-06-12 13:41:15 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00
Tim Daubenschütz
7d5780d62a add another troubleshooting section 2015-06-12 10:14:34 +02:00
ddejongh
bf0a2aeefb consign unconsign requests
async emails
2015-06-11 15:03:55 +02:00
vrde
05b9792d3f Add some new constants to the app 2015-06-10 17:28:36 +02:00
ddejongh
af71196dfd delete function for multi editions 2015-06-10 15:49:46 +02:00
vrde
7aca8ba0fc Merge branch 'master' into AD-436-route-to-django-or-jsapp 2015-06-10 15:43:04 +02:00
vrde
4ada116585 Add missing semicolon 2015-06-10 15:42:35 +02:00
vrde
f91b27d2a8 FFFUUUUU I cannot markdown 2015-06-10 15:37:42 +02:00
vrde
49d458d304 Fix README.md 2015-06-10 15:35:24 +02:00
vrde
b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
ddejongh
9241d3e38f further details functional / unstyled 2015-06-09 17:24:06 +02:00
ddejongh
509aa111ab Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
2015-06-09 16:10:38 +02:00
vrde
5445698eea [wip] add temporary base url 2015-06-09 16:10:25 +02:00
ddejongh
30ee436f4c Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
2015-06-09 16:09:59 +02:00
Tim Daubenschütz
669f2b3ae7 resolve merge conflict 2015-06-09 13:38:01 +02:00
Tim Daubenschütz
296176572e add different kinds of notifications 2015-06-09 13:36:09 +02:00
ddejongh
6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00
Tim Daubenschütz
d3fc902411 add que functionality to globalnotification 2015-06-09 12:08:14 +02:00
Tim Daubenschütz
e0e75151e0 add first working prototype 2015-06-08 18:14:25 +02:00
vrde
f732cec523 Merge branch 'AD-432-put-onion-online'
Conflicts:
	gulpfile.js
	package.json
2015-06-08 18:00:17 +02:00
vrde
38a476f7e8 Enable compression 2015-06-08 17:26:27 +02:00
vrde
798fa1c38a disable compression 2015-06-08 17:23:10 +02:00
vrde
c4fee2880f Enable compression 2015-06-08 17:20:08 +02:00
vrde
54b996db90 Move build dep form "defDependencies" to "dependencies"
See
https://devcenter.heroku.com/articles/nodejs-support#customizing-the-build-process
2015-06-08 15:58:59 +02:00
vrde
9f2019e168 Add tasks to put code in production 2015-06-08 15:42:28 +02:00
vrde
a1bfbb8f86 [wip] add server to serve app 2015-06-08 15:24:58 +02:00
Tim Daubenschütz
b49f3fe9f2 set state bug fix 2015-06-08 14:51:13 +02:00
Tim Daubenschütz
8a17208643 fix bulk modal bug 2015-06-08 14:23:19 +02:00
Tim Daubenschütz
98d26f5ed7 fix minor checkbox bug 2015-06-08 14:13:35 +02:00
Tim Daubenschütz
b2241c0551 fix bulk action modal formating 2015-06-08 14:01:47 +02:00
Tim Daubenschütz
1b52864f3e remove testing from watch process 2015-06-08 13:55:55 +02:00
Tim Daubenschütz
6d337890d0 merge conflict 2015-06-08 13:47:24 +02:00
Tim Daubenschütz
cea111c25e solve conflict 2015-06-08 11:51:49 +02:00
Tim Daubenschütz
e2ab0c1a5c format stuff 2015-06-08 11:50:40 +02:00
Tim Daubenschütz
793e1a78ca add tests for generalutils 2015-06-08 11:19:18 +02:00
vrde
38ab68b599 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-06-08 10:14:14 +02:00
vrde
a2cf18986d Update readme with workaround for CORS extension 2015-06-08 10:13:48 +02:00
Tim Daubenschütz
b1973d3a64 finish integrating jest testing suite 2015-06-08 09:53:14 +02:00
Tim Daubenschütz
82bea4c241 integrate jest - not working yet though 2015-06-05 16:57:56 +02:00
Tim Daubenschütz
851d42e1d9 quick fix 2015-06-05 16:23:16 +02:00
Tim Daubenschütz
95f4efa92d merge conflict 2015-06-05 16:21:36 +02:00
Tim Daubenschütz
443829320f add personal note to piece detail page 2015-06-05 16:20:28 +02:00
Tim Daubenschütz
3a812e531d fix search bug 2015-06-05 15:17:35 +02:00