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 |
|
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 |
|