ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity
2,380 Commits 115 Branches 0 Tags 13 MiB
8f2ace77af
Commit Graph

2380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8383202ceb css fix 2015-05-29 09:20:09 +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
64793cd90b remove npm start scripts, add gulp for build and watch, add source maps 2015-05-26 19:16:30 +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
vrde
b31bedb8ea Update readme 2015-05-26 11:12:17 +02:00
vrde
b09c021e44 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-05-26 10:52:47 +02:00
vrde
d71f4af556 Update README.md 2015-05-26 10:52:39 +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