1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

245 Commits

Author SHA1 Message Date
Tim Daubenschütz
8ceabda1c5 add queryparams modal 2015-06-15 15:46:33 +02:00
ddejongh
56d32efcc0 password reset
modal switch problems
2015-06-15 15:28:53 +02:00
ddejongh
66f8a6a1ca login/logout functional 2015-06-15 12:36:27 +02:00
vrde
07686f514f Fix (hopefully) CORS 2015-06-15 11:55:50 +02:00
ddejongh
aac8ae2a9e merged master 2015-06-15 11:02:49 +02:00
ddejongh
4e1ef9fc72 Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 2015-06-15 09:59:53 +02:00
Tim Daubenschütz
989b121678 Fix mangling issue 2015-06-15 08:44:44 +02:00
ddejongh
6ef233e43d Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field- 2015-06-11 17:22:27 +02:00
ddejongh
0f1108b14e form password + signup 2015-06-11 17:22:11 +02:00
vrde
fa97470e21 Enable CORS on the frontend 2015-06-11 17:07:27 +02:00
ddejongh
5e746295bc application constants 2015-06-11 16:24:37 +02:00
ddejongh
5e7f7983e1 application constants 2015-06-11 15:57:19 +02:00
ddejongh
f4c6e025ae Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
2015-06-11 15:54:50 +02:00
ddejongh
4f5e7a0821 login form 2015-06-11 15:35:18 +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
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
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
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
Tim Daubenschütz
7f82d49278 resolve merge 2015-06-05 14:29:37 +02:00
Tim Daubenschütz
76a41a23b9 add details to piece detail page 2015-06-05 14:22:02 +02:00
vrde
62cc6b41df Lint code 2015-06-05 14:14:59 +02:00
vrde
e8627cd0a3 Merge branch 'master' into AD-412-mediaplayer
Conflicts:
	js/components/ascribe_media/resource_viewer.js
	js/components/edition_container.js
	js/mixins/inject_in_head_mixin.js
	package.json
2015-06-05 13:18:16 +02:00
vrde
a4b3438a2d Add shmui to handle images 2015-06-05 13:15:31 +02:00
Tim Daubenschütz
a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +02:00