ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,624 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

2624 Commits

Author SHA1 Message Date
vrde ff6855970e Still working on image preview 2015-06-04 17:23:40 +02:00
Tim Daubenschütz 6f73f1ebfd refactor table to bootstrap table 2015-06-04 17:21:38 +02:00
Tim Daubenschütz 6aa74d6b42 fix separation of orderings in edtionLists 2015-06-04 16:41:14 +02:00
vrde 13caad7794 Refactor and restyle 2015-06-04 16:15:59 +02:00
Tim Daubenschütz eaefd253d5 fixing AD-393 2015-06-04 16:13:10 +02:00
Tim Daubenschütz 4fd5cdcdb5 add real href to edition list 2015-06-04 16:07:37 +02:00
Tim Daubenschütz 6da18e9a85 rename mergeOptions 2015-06-04 15:38:15 +02:00
Tim Daubenschütz 8a3ff445ef use mergeOptionsList on all react components 2015-06-04 15:33:59 +02:00
Tim Daubenschütz 1230ae7192 add handle success functionality to piece list and implement onject merger for components with multiple stores 2015-06-04 15:30:21 +02:00
vrde d44cf295f0 Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer 
Conflicts:
	js/components/ascribe_media/resource_viewer.js
 2015-06-04 14:12:29 +02:00
Tim Daubenschütz a93634f010 add transition model and callback for closing the edition list of a piece after changing route 2015-06-04 13:48:07 +02:00
Tim Daubenschütz aaf393d48a Merge branch 'master' into AD-410-finish-implementing-piecelist-pag 2015-06-04 13:18:32 +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 302f05b68e add link functionality 2015-06-04 11:41:56 +02:00
Tim Daubenschütz 0747c89a35 documenting known issue with open/close state of edition list table 2015-06-04 10:25:31 +02:00
Tim Daubenschütz 4fe5766bc4 add select all functionality for edition list table 2015-06-04 10:11:18 +02:00
Tim Daubenschütz ef6662e859 add ordering functionality to editionlist table 2015-06-04 09:16:30 +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
Tim Daubenschütz 8d560fb664 thumbnail is not croped anymore 2015-06-03 16:48:31 +02:00
Tim Daubenschütz e3c3afcefa add year to accordion-list-item 2015-06-03 16:34:32 +02:00
ddejongh 5f8abcffd2 Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field- 2015-06-03 11:59:42 +02:00
ddejongh 876ade5f12 collapse part 1 2015-06-03 11:56:49 +02:00
Tim Daubenschütz 28a1c8f2d4 fix modal undefined bug 2015-06-03 11:49:39 +02:00
Tim Daubenschütz b4076aeef7 code styling 2015-06-03 10:45:23 +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
ddejongh a51c27fb9f loan form styled, 
overlay styled
 2015-06-02 18:43:37 +02:00
ddejongh 82d14b30fc fixed form mixin 2015-06-02 18:16:18 +02:00
Tim Daubenschütz 95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
ddejongh 97338f2727 multiloan 2015-06-02 16:47:25 +02:00
Tim Daubenschütz 0ef0558e3f merge localization 2015-06-02 15:38:54 +02:00
ddejongh d157719043 multiloan 2015-06-02 15:38:47 +02:00
Tim Daubenschütz ed2adb324b Merge branch 'AD-51-refactor-table-to-mockup' 2015-06-02 15:37:26 +02:00
Tim Daubenschütz 4b64f52d71 comment out filter widget 2015-06-02 15:36:06 +02:00
Tim Daubenschütz 53a01115f2 put show state of item list in store to fix bug 2015-06-02 15:33:48 +02:00
ddejongh cdf8a358df loan/share forms multiedition 2015-06-02 15:10:40 +02:00
Tim Daubenschütz ff5355f0ee better error messages 2015-06-02 14:43:42 +02:00
vrde 633f7f5b33 Merge branch 'master' into piece-detail-mediaplayer 2015-06-02 14:39:38 +02:00
Tim Daubenschütz 0a45f12ba7 Merge remote-tracking branch 'origin/master' into AD-350-integrate-localization 2015-06-02 14:34:08 +02:00
Tim Daubenschütz b5c434aa18 documentation 2015-06-02 14:33:30 +02:00
vrde 842575a3cd Fix fetch 2015-06-02 14:33:00 +02:00
Tim Daubenschütz fd0b3c0ead minor stuff 2015-06-02 14:29:06 +02:00
Tim Daubenschütz 3183dae054 add german language file and integrated translation method 2015-06-02 14:25:26 +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 6160659964 Merge remote-tracking branch 'origin/piece-detail-setup' into piece-detail-setup 2015-06-02 14:00:45 +02:00
ddejongh 74faa286f1 loan/share forms multiedition 2015-06-02 14:00:05 +02:00
Tim Daubenschütz 347517a0b3 refactor all util functions for nicer usability 2015-06-02 13:48:01 +02:00
vrde 141d21155b WIP to style widgets, will continue later 2015-06-02 13:44:50 +02:00