11 Commits

Author	SHA1	Message	Date
Tim Daubenschütz	62ae8fd08b	fix warnings	2015-07-10 14:15:22 +02:00
diminator	fd8859fd22	Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- ... Conflicts: js/components/ascribe_detail/edition.js	2015-07-09 14:54:11 +01:00
diminator	9fd4c1a6fd	otherdata and extradata on a piece level and templated in frontend	2015-07-09 13:37:33 +01:00
Sylvain Bellemare	f066008ce9	translated english text to french	2015-07-08 09:57:50 +02:00
ddejongh	89884ced1f	edition detail updated with forms	2015-06-22 23:32:41 +02:00
ddejongh	fabff2922c	account settings	2015-06-17 17:48:23 +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	03f09b8c83	Rename fetch to requests to avoid name clashing	2015-06-16 13:48:48 +02:00
ddejongh	9241d3e38f	further details functional / unstyled	2015-06-09 17:24:06 +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