ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Code Issues Releases Wiki Activity
264 Commits 115 Branches 0 Tags 13 MiB
669f2b3ae7
Commit Graph

222 Commits

Author SHA1 Message Date
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
Tim Daubenschütz
7c4d4afbd4 add checkbox select functionality 2015-06-01 14:10:11 +02:00
Tim Daubenschütz
f653564b51 implement toggle functionality 2015-06-01 13:18:24 +02:00
ddejongh
d90a4f97db loan 2015-06-01 13:02:53 +02:00
Tim Daubenschütz
ade6ab7f26 integrate table component into accordion list 2015-06-01 11:51:03 +02:00
Tim Daubenschütz
ed66c4150e refactor routes 2015-06-01 09:05:30 +02:00
ddejongh
2c7535a73a unconsign 2015-05-29 16:53:30 +02:00
Tim Daubenschütz
897b771068 style and prepare boilerplate components 2015-05-29 16:28:05 +02:00
ddejongh
4fdf0ecc5c Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup 2015-05-29 15:34:31 +02:00
ddejongh
c6e97d916d Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi 
Conflicts:
	piece/models.py
	web/urls/frontend.py
 2015-05-29 15:27:40 +02:00
ddejongh
961b8ee58d errors for non-fields, 500 
removed retry
consign_form
 2015-05-29 15:16:42 +02:00
Tim Daubenschütz
78d61dd1d6 integrate libsass and refactoring css files 2015-05-29 11:45:10 +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
7a18c150c7 merged all branches 
fixed clear errors
 2015-05-29 10:58:07 +02:00
Tim Daubenschütz
c177d382e4 Merge branch 'selectable-table-items' 2015-05-29 10:56:44 +02:00
vrde
d4e55f649d Merge branch 'piece-detail-setup' 
Conflicts:
	js/components/ascribe_table/table.js
	js/components/ascribe_table/table_item_subtable.js
 2015-05-29 10:50:49 +02:00
ddejongh
b8ffac4275 merge table branch 2015-05-29 09:20:01 +02:00
ddejongh
61342a55e8 cleanup 2015-05-29 09:13:00 +02:00
ddejongh
c3ea9aecbe form framework 
- inputtext, area, btn
 - alertmixin
 - formmixin
 - 500
 - transfer/share
 2015-05-29 01:54:56 +02:00
ddejongh
0a4dae850b solved error + reusability refactor 2015-05-28 18:18:13 +02:00
ddejongh
d4a98ce7c4 modal error resolves 2015-05-28 10:16:58 +02:00
ddejongh
a8807e8d3c modal error resolves 2015-05-27 18:54:45 +02:00
vrde
97abafda0d Fix error handling on AJAX request 2015-05-27 17:55:09 +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
Tim Daubenschütz
e4eee35b8f add editions-selected-count to toolbar 2015-05-27 15:49:12 +02:00
Tim Daubenschütz
b9620d00aa add acl buttons for selection 2015-05-27 14:35:33 +02:00
Tim Daubenschütz
f85d4fd106 implement intersection logic for acls 2015-05-27 13:57:11 +02:00
Tim Daubenschütz
58e284cbdf refactor edition-button 2015-05-27 09:56:26 +02:00
ddejongh
8624eb26c7 sharemodal view 2015-05-27 09:34:49 +02:00
Tim Daubenschütz
aa75b7d8bd fix small bug 2015-05-27 09:05:39 +02:00
Tim Daubenschütz
f6dab18cba small refactor 2015-05-27 08:24:13 +02:00
Tim Daubenschütz
b875a9817c Refactor table_item logic 2015-05-26 20:20:17 +02:00
Tim Daubenschütz
abac948dd1 Add ACL display for table 2015-05-26 19:59:37 +02:00
Tim Daubenschütz
9c017ac993 Fix bind warning 2015-05-26 19:50:18 +02:00
Tim Daubenschütz
d71e6baa19 add persistent selected rows 2015-05-26 17:25:03 +02:00
ddejongh
3a103c1d99 modal try 1 2015-05-26 16:52:53 +02:00
Tim Daubenschütz
92be6a63e8 select state is saved in the store 2015-05-26 16:48:48 +02:00
ddejongh
d685d68d15 modal try 1 2015-05-26 16:46:50 +02:00
ddejongh
230ecfb0e4 modal try 1 2015-05-26 16:46:02 +02:00
ddejongh
e3c115897f refactored edition properties 2015-05-26 15:31:28 +02:00
vrde
fd72c1859c Merge branch 'master' into piece-detail-mediaplayer 2015-05-26 15:22:43 +02:00
ddejongh
dc33c74da6 edition loads in detail 2015-05-26 14:58:11 +02:00
Tim Daubenschütz
ca97bd9af5 Refactor TableColumnMixin 2015-05-26 14:57:32 +02:00
vrde
bd270f1e8c Add number of editions on button 2015-05-26 14:43:04 +02:00
Tim Daubenschütz
65ccaf10cf remove all .DS_Store and add to gitignore 2015-05-26 14:32:28 +02:00
vrde
efe1e44c9d Reindent for readability 2015-05-26 14:09:15 +02:00
Tim Daubenschütz
b5f0180cd6 Orderable Resource not a requirement for table anymore 2015-05-26 14:05:34 +02:00
vrde
809c89eb97 Merge branch 'master' of bitbucket.org:ascribe/onion 
Conflicts:
	js/components/piece_list.js
 2015-05-26 13:53:31 +02:00
vrde
c6f96a1087 Fix bug with empty query.page 2015-05-26 13:52:44 +02:00