ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 18:13:49 +01:00
Code Issues Releases Wiki Activity
1,517 Commits 115 Branches 0 Tags 13 MiB
0a07106ae8
Commit Graph

1203 Commits

Author SHA1 Message Date
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
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
Tim Daubenschütz
ff5355f0ee better error messages 2015-06-02 14:43:42 +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
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
699c07fe3f Merge branch 'master' into AD-351-refactor-fetch 2015-06-01 16:45:40 +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
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
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
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
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
ddejongh
bcf8756cd3 edition 2015-05-26 13:48:46 +02:00
ddejongh
497e43005e Merge remote-tracking branch 'remotes/origin/master' into piece-detail-setup 
Conflicts:
	css/main.css
	js/components/ascribe_table/table_item_subtable.js
 2015-05-26 13:48:00 +02:00
ddejongh
f564e909f7 piece_detail thumb + header 2015-05-26 13:33:35 +02:00
Tim Daubenschütz
620506b17c Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-26 13:14:44 +02:00
Tim Daubenschütz
5f492ff13b add foldable editions table 2015-05-26 13:14:35 +02:00
vrde
a33431876c Restore PieceListStore listener 2015-05-26 11:47:56 +02:00
Tim Daubenschütz
54866cda84 Improved naming 2015-05-26 10:52:20 +02:00
Tim Daubenschütz
1cb0b54f77 Added PieceDetail boilerplate code 2015-05-26 10:41:41 +02:00
Tim Daubenschütz
ffd1326366 resolve merge conflict 2015-05-22 18:43:15 +02:00
Tim Daubenschütz
0927d021c9 put architecture for transcluding TableItem in place 2015-05-22 18:41:15 +02:00
vrde
39404b92f1 Add more logic to pagination 2015-05-22 17:11:17 +02:00
Tim Daubenschütz
4c0e7992f4 Inject elements-to-transclude in the table 2015-05-22 16:51:08 +02:00
vrde
4752ac83c4 Move pagination components in their own folder 2015-05-22 15:03:29 +02:00
Tim Daubenschütz
47dd322cff Add dynamically injectable TableItems to Table Component 2015-05-22 14:15:12 +02:00
Tim Daubenschütz
486f058cb8 Refactor: Finally found pattern for making components truly generic 2015-05-22 13:58:09 +02:00
Tim Daubenschütz
654d9b93c3 Implement more pagination functionality 2015-05-22 13:43:53 +02:00
Tim Daubenschütz
d77cc20da6 Make Pagination more generic 2015-05-22 12:58:06 +02:00
Tim Daubenschütz
2c3b7c3025 Make Table component more generic 2015-05-22 11:33:38 +02:00
Tim Daubenschütz
29d9572a37 upgrade alt version. Please do npm install and check if altjs is at version 0.16.5 2015-05-22 11:25:21 +02:00
Tim Daubenschütz
4815b650c5 Merge branch 'master' of bitbucket.org:ascribe/onion 
Conflicts:
	js/components/piece_list.js
 2015-05-21 18:02:12 +02:00
Tim Daubenschütz
9c21edf8c4 refactor, also add boilerplate edition store, actions and container 2015-05-21 18:00:40 +02:00
vrde
f28c6d47f6 Merge branch 'master' of bitbucket.org:ascribe/onion 
Conflicts:
	js/components/piece_list.js
 2015-05-21 17:55:59 +02:00
vrde
0a2895e0d6 Pagination works, it still needs some love 2015-05-21 17:54:27 +02:00
Tim Daubenschütz
60d4ce8eaf fix direction of carret 2015-05-21 16:06:16 +02:00
Tim Daubenschütz
fb6945914c Refactor to proper TableColumnModel including model validation 2015-05-21 16:02:42 +02:00
Tim Daubenschütz
6821f5eb34 format header html 2015-05-21 15:20:02 +02:00
Tim Daubenschütz
0f6dc6b3e0 put link in header 2015-05-21 15:16:56 +02:00
Tim Daubenschütz
8376032b95 group table component 2015-05-21 15:14:05 +02:00
Tim Daubenschütz
653e0cadcb Complete ordering functionality 2015-05-21 14:51:15 +02:00
Tim Daubenschütz
14728af9f1 fix step 1 2015-05-21 14:03:56 +02:00
Tim Daubenschütz
9506cf3b1b implement ordering 2015-05-21 12:12:25 +02:00
Tim Daubenschütz
284f729dca Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-20 19:20:18 +02:00
Tim Daubenschütz
a4a4482d18 start implementing sort 2015-05-20 19:19:57 +02:00
vrde
ddc050507a Add header 2015-05-20 17:46:16 +02:00
vrde
951892a85c Add header 2015-05-20 17:35:52 +02:00
Tim Daubenschütz
52c980bfea Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-20 17:32:26 +02:00
Tim Daubenschütz
8c39335f3d Some styling 2015-05-20 17:32:06 +02:00
vrde
8ee9bda37b Fix spacing 2015-05-20 16:44:45 +02:00
vrde
d14e56f223 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-20 16:19:44 +02:00
vrde
0527e0184e Work on UserStuff 2015-05-20 16:19:40 +02:00
Tim Daubenschütz
37641650eb Add dynamical rowWidth functionailty to table 2015-05-20 16:10:02 +02:00
Tim Daubenschütz
526b241fea Add dynamically addable components to table component 2015-05-20 15:44:15 +02:00
Tim Daubenschütz
f4700e9842 resolve merge conflict 2015-05-20 15:23:15 +02:00
Tim Daubenschütz
d46b7f67dd introduce generic table types 2015-05-20 15:22:29 +02:00
Tim Daubenschütz
923db02f78 Add generic table 2015-05-20 14:48:57 +02:00
Tim Daubenschütz
0b4765aa5c layout basic table 2015-05-20 12:09:35 +02:00
vrde
f575f2b4ca Subclass React in the proper way 2015-05-20 12:00:16 +02:00
Tim Daubenschütz
ba71bd5788 refactor to use AltContainer to start developing the new table component 2015-05-20 11:32:56 +02:00
Tim Daubenschütz
06d0b7abe6 fill unordered list 2015-05-20 11:24:29 +02:00
Tim Daubenschütz
5080de1481 Add boilerplate table and tableitem. Also integrate bootstrap 2015-05-20 11:16:42 +02:00
Tim Daubenschütz
2b8e1d604b refactor: use let instead of var 2015-05-19 17:16:01 +02:00
Tim Daubenschütz
9784e09aac refactor: rename artwork to piece and artworkList to pieceList 2015-05-19 17:13:09 +02:00
Tim Daubenschütz
47246a9083 create artwork component 2015-05-19 17:01:28 +02:00
Tim Daubenschütz
9c58fa321c add encoding and camel to snake case conversion to FetchApiUtils 2015-05-19 14:09:10 +02:00
Tim Daubenschütz
fe5820b44a Fix autobinding bug, considering the components creation 2015-05-19 11:23:49 +02:00
vrde
4da72d8846 Load some pieces from API endpoint 2015-05-19 10:16:44 +02:00
vrde
5dd7cd7554 Refactor a bit 2015-05-18 18:00:12 +02:00
Tim Daubenschütz
48e0b0076f fetchers 2015-05-18 16:06:47 +02:00
Tim Daubenschütz
c6097fe5c2 outsourced routes to separate file and created a boilerplate action and store 2015-05-18 13:43:42 +02:00
Tim Daubenschütz
6ae7ff0d4b code formatting 2015-05-18 09:59:45 +02:00
Tim Daubenschütz
25a715ddb3 continuing file structure 2015-05-18 09:56:16 +02:00
Tim Daubenschütz
0d0069a2a6 renaming app from HelloApp to AscribeApp 2015-05-18 09:31:22 +02:00
Tim Daubenschütz
7a1bd8cd82 fixed hash in url 2015-05-18 09:29:51 +02:00
Tim Daubenschütz
4d7198fab9 integrated react-router 2015-05-15 15:38:25 +02:00
vrde
23c033f12f Build pipeline works 2015-05-15 15:05:17 +02:00
vrde
49eaca1e9f Add some code 2015-05-13 16:26:12 +02:00