ddejongh
|
6160659964
|
Merge remote-tracking branch 'origin/piece-detail-setup' into piece-detail-setup
|
2015-06-02 14:00:45 +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 |
|
vrde
|
141d21155b
|
WIP to style widgets, will continue later
|
2015-06-02 13:44:50 +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
|
6f33b291f9
|
remove lodash templates
|
2015-06-02 13:10:10 +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 |
|
Tim Daubenschütz
|
88fe43b3e2
|
add es6-promise to package.json
|
2015-06-02 09:00:05 +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
|
9f255d7db7
|
Remove build from git, fix bugs in gulp and exclude variables.scss
|
2015-05-29 14:00:09 +02:00 |
|
Tim Daubenschütz
|
e14e1cfae1
|
add glyphicons
|
2015-05-29 13:38:59 +02:00 |
|
Tim Daubenschütz
|
2cae7ab76d
|
add scss files to browser-sync
|
2015-05-29 12:08:26 +02:00 |
|
Tim Daubenschütz
|
fe78f30dc8
|
remove cdn bootstrap and integrate bootstrap-sass. PLZ DO NPM INSTALL
|
2015-05-29 12:02:37 +02:00 |
|
Tim Daubenschütz
|
21bb8bf97f
|
remove jquery and bootstrap
|
2015-05-29 11:57:53 +02:00 |
|
Tim Daubenschütz
|
70f333292d
|
separat fonts and images
|
2015-05-29 11:57:24 +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
|
8383202ceb
|
css fix
|
2015-05-29 09:20:09 +02:00 |
|