1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Commit Graph

57 Commits

Author SHA1 Message Date
diminator
ea770943f2 editions and api_urls 2015-06-29 16:15:41 +02:00
Tim Daubenschütz
6c44333f1a add file drag and drop toolbar 2015-06-29 16:00:26 +02:00
diminator
5916c27c45 uploader defaultprops 2015-06-29 10:00:26 +02:00
diminator
eff25a9801 withdraw transfer with delete of transfer record 2015-06-26 11:44:35 +02:00
diminator
99d6dd278c withdraw fix 2015-06-26 01:05:20 +02:00
diminator
7e115e26ad withdraw transfer part one 2015-06-26 00:38:40 +02:00
diminator
b1ad4cc36f withdraw transfer part one 2015-06-25 23:25:03 +02:00
diminator
d980ef7949 verify button link 2015-06-25 15:23:10 +02:00
diminator
fba30a565b coa renders per page
verify
2015-06-25 14:39:39 +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
d50b3ca14d fixed logout 2015-06-16 20:35:19 +02:00
ddejongh
ff12048c10 edition note 2015-06-16 16:38:22 +02:00
ddejongh
9cf060fdc4 csrf subdomain 2015-06-16 14:49:00 +02:00
ddejongh
8d73e4a77b edit acl
editionnote
2015-06-16 14:01:53 +02:00
ddejongh
bf0a2aeefb consign unconsign requests
async emails
2015-06-11 15:03:55 +02:00
ddejongh
af71196dfd delete function for multi editions 2015-06-10 15:49:46 +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
ddejongh
6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00
Tim Daubenschütz
443829320f add personal note to piece detail page 2015-06-05 16:20:28 +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
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
Tim Daubenschütz
a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +02:00
Tim Daubenschütz
18a2806fb1 minor fixes 2015-06-05 11:32:10 +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
vrde
13caad7794 Refactor and restyle 2015-06-04 16:15:59 +02:00
vrde
641e8ac82d Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer
Conflicts:
	js/components/edition.js
	js/mixins/inject_in_head_mixin.js
2015-06-03 17:44:13 +02:00
vrde
34cf9e6871 Add support for videos and images 2015-06-03 16:53:27 +02:00
ddejongh
876ade5f12 collapse part 1 2015-06-03 11:56:49 +02:00
ddejongh
265a7573ce aclbuttonlist willmount 2015-06-03 10:43:59 +02:00
ddejongh
6078410240 refactored buttons 2015-06-03 10:27:11 +02:00
Tim Daubenschütz
95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
vrde
3e7a670509 Merge branch 'master' into piece-detail-mediaplayer
Conflicts:
	js/components/edition.js
2015-06-02 14:00:47 +02:00
ddejongh
dc3d024f8d bulk transfer part 1 2015-06-02 11:38:18 +02:00
ddejongh
cbecbf44ad bind modals to actionbuttons 2015-06-01 18:59:47 +02:00
ddejongh
1c76c5ef48 merge fix 2015-06-01 16:04:34 +02:00
ddejongh
420516a2fe merge fix 2015-06-01 16:03:41 +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
vrde
f50d28be98 Refactor fetch, WIP 2015-06-01 14:22:04 +02:00
ddejongh
d90a4f97db loan 2015-06-01 13:02:53 +02:00
ddejongh
2c7535a73a unconsign 2015-05-29 16:53:30 +02:00
ddejongh
961b8ee58d errors for non-fields, 500
removed retry
consign_form
2015-05-29 15:16:42 +02:00
vrde
3ac5cc5dde Merge branch 'master' into piece-detail-mediaplayer
Conflicts:
	js/components/ascribe_table/table_item_subtable.js
	js/components/edition.js
2015-05-29 11:22:19 +02:00
ddejongh
c3ea9aecbe form framework
- inputtext, area, btn
 - alertmixin
 - formmixin
 - 500
 - transfer/share
2015-05-29 01:54:56 +02:00
vrde
df95e75025 WIP 2015-05-27 17:34:33 +02:00
ddejongh
3c3504d773 modal error 2015-05-27 17:33:15 +02:00
ddejongh
76317dcdca modal + forms 2015-05-27 15:53:26 +02:00
ddejongh
8624eb26c7 sharemodal view 2015-05-27 09:34:49 +02:00