ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
332 Commits 115 Branches 0 Tags 13 MiB
ec6cd38709
Commit Graph

272 Commits

Author SHA1 Message Date
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
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
8f65aa7a2d Add "other" type display 2015-06-04 17:37:46 +02:00
Tim Daubenschütz
c177b95f45 responsive table 2015-06-04 17:28:14 +02:00
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
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
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
Tim Daubenschütz
366fcbf4f3 refactor general utils 2015-06-02 13:42:17 +02:00
Tim Daubenschütz
68be98c3f0 integrate string formating functionality 2015-06-02 13:31:12 +02:00
Tim Daubenschütz
a19ea989ef Merge branch 'master' into AD-350-integrate-localization 2015-06-02 13:10:12 +02:00
Tim Daubenschütz
777857b50c include lodash.templates 2015-06-02 12:00:59 +02:00
Tim Daubenschütz
713dd72b2b add unfinished filtering widget 2015-06-02 11:40:55 +02:00
ddejongh
dc3d024f8d bulk transfer part 1 2015-06-02 11:38:18 +02:00
Tim Daubenschütz
eb5d6f6cc3 implement search functionality 2015-06-02 10:10:09 +02:00
Tim Daubenschütz
c2c2049229 rename piece_list_toolbar to a more fitting name: piece_list_bulk_modal 2015-06-02 09:10:26 +02:00
ddejongh
cbecbf44ad bind modals to actionbuttons 2015-06-01 18:59:47 +02:00
Tim Daubenschütz
f2d9f3b115 start implementing localization functionality 2015-06-01 18:20:15 +02:00
vrde
2301373cae Remove useless code 2015-06-01 18:00:34 +02:00
vrde
4ee4530029 Refactor fetch 2015-06-01 17:43:38 +02:00
vrde
699c07fe3f Merge branch 'master' into AD-351-refactor-fetch 2015-06-01 16:45:40 +02:00
vrde
096739e225 Update post to work with new code 2015-06-01 16:45:12 +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
68827466ca Remove useless code 2015-06-01 15:37:02 +02:00
Tim Daubenschütz
8a18d894cc add clear selection functionality 2015-06-01 15:12:31 +02:00
vrde
165d2e9b1d Fix datetime selector 2015-06-01 14:49:13 +02:00
vrde
f50d28be98 Refactor fetch, WIP 2015-06-01 14:22:04 +02:00
ddejongh
f9a3be61d2 loan date 2015-06-01 14:16:06 +02:00