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

30 Commits

Author SHA1 Message Date
ddejongh
fabff2922c account settings 2015-06-17 17:48:23 +02:00
ddejongh
d50b3ca14d fixed logout 2015-06-16 20:35:19 +02:00
ddejongh
1ecd579718 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not
Conflicts:
	js/utils/requests.js
2015-06-16 14:06:35 +02:00
ddejongh
8d73e4a77b edit acl
editionnote
2015-06-16 14:01:53 +02:00
vrde
a247e111c0 Merge branch 'AD-421-add-signup-functionality'
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
2015-06-16 10:58:41 +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
ddejongh
aac8ae2a9e merged master 2015-06-15 11:02:49 +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
2bb004d2fb remove edition list count in table 2015-06-12 15:00:26 +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
vrde
5445698eea [wip] add temporary base url 2015-06-09 16:10:25 +02:00
vrde
a1bfbb8f86 [wip] add server to serve app 2015-06-08 15:24:58 +02:00
Tim Daubenschütz
a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +02:00
Tim Daubenschütz
f987bce7cc add es6lint to build process and fix most (not really) errors and warnings 2015-06-05 11:06:36 +02:00
Tim Daubenschütz
c19a05ca50 fix setState bug by renaming componentDidUnmount to componentWillUnmount 2015-06-04 13:17:59 +02:00
Tim Daubenschütz
ccbf411168 fixed store bindings 2015-06-04 13:16:19 +02:00
Tim Daubenschütz
28a1c8f2d4 fix modal undefined bug 2015-06-03 11:49:39 +02:00
Tim Daubenschütz
3183dae054 add german language file and integrated translation method 2015-06-02 14:25:26 +02:00
Tim Daubenschütz
f2d9f3b115 start implementing localization functionality 2015-06-01 18:20:15 +02:00
Tim Daubenschütz
897b771068 style and prepare boilerplate components 2015-05-29 16:28:05 +02:00
Tim Daubenschütz
6821f5eb34 format header html 2015-05-21 15:20:02 +02:00
Tim Daubenschütz
0f6dc6b3e0 put link in header 2015-05-21 15:16:56 +02:00
Tim Daubenschütz
8376032b95 group table component 2015-05-21 15:14:05 +02:00
vrde
ddc050507a Add header 2015-05-20 17:46:16 +02:00
vrde
951892a85c Add header 2015-05-20 17:35:52 +02:00
vrde
0527e0184e Work on UserStuff 2015-05-20 16:19:40 +02:00
vrde
f575f2b4ca Subclass React in the proper way 2015-05-20 12:00:16 +02:00