ddejongh
|
41d70a9a15
|
Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar
Conflicts:
js/components/ascribe_forms/form.js
js/components/settings_container.js
sass/ascribe_settings.scss
|
2015-06-23 16:07:17 +02:00 |
|
ddejongh
|
95f6c08706
|
localization
|
2015-06-23 16:02:48 +02:00 |
|
ddejongh
|
6dd3e582df
|
fineuploader + register
|
2015-06-23 13:55:05 +02:00 |
|
ddejongh
|
3f3e9a273f
|
git removed s3-fineuploader
|
2015-06-23 10:27:19 +02:00 |
|
ddejongh
|
c8cb456709
|
Removed submodule react-s3
|
2015-06-23 10:16:53 +02:00 |
|
ddejongh
|
89884ced1f
|
edition detail updated with forms
|
2015-06-22 23:32:41 +02:00 |
|
ddejongh
|
02f8193743
|
style tweaks
|
2015-06-22 18:02:04 +02:00 |
|
ddejongh
|
9e1a76a08e
|
api settings complete
|
2015-06-22 17:33:25 +02:00 |
|
ddejongh
|
f836d4c2d4
|
register first cut
|
2015-06-22 10:50:22 +02:00 |
|
ddejongh
|
23190f6c48
|
signup/login
|
2015-06-20 16:43:18 +02:00 |
|
ddejongh
|
e1dbc0e183
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 14:05:56 +02:00 |
|
ddejongh
|
efc7f6d46b
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 13:13:37 +02:00 |
|
ddejongh
|
48d44c0a30
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 11:01:06 +02:00 |
|
ddejongh
|
6c746d09f7
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 10:53:56 +02:00 |
|
ddejongh
|
c2d8b78136
|
settings
|
2015-06-18 19:03:03 +02:00 |
|
ddejongh
|
9b3c7e9f21
|
CC google tag manager
|
2015-06-18 10:35:36 +02:00 |
|
Tim Daubenschütz
|
3a8efb3dd6
|
Dimi and Tim styling action
|
2015-06-17 19:50:52 +02:00 |
|
Tim Daubenschütz
|
cd9c561ddf
|
boilerplate for piece registration
|
2015-06-17 17:48:52 +02:00 |
|
ddejongh
|
fabff2922c
|
account settings
|
2015-06-17 17:48:23 +02:00 |
|
vrde
|
41b0a33d93
|
Merge branch 'master' into AD-44-in-piece-detail-support-public-not
|
2015-06-17 10:46:31 +02:00 |
|
vrde
|
5165fa6c8c
|
Fix https schema for jquery
|
2015-06-17 10:16:28 +02:00 |
|
ddejongh
|
37dfde83b0
|
Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not
|
2015-06-16 20:37:01 +02:00 |
|
ddejongh
|
d50b3ca14d
|
fixed logout
|
2015-06-16 20:35:19 +02:00 |
|
ddejongh
|
ff12048c10
|
edition note
|
2015-06-16 16:38:22 +02:00 |
|
ddejongh
|
9cf060fdc4
|
csrf subdomain
|
2015-06-16 14:49:00 +02:00 |
|
vrde
|
dfd4435e27
|
Fix baseUrl to load shmui
|
2015-06-16 14:42:36 +02:00 |
|
ddejongh
|
1ecd579718
|
Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not
Conflicts:
js/utils/requests.js
|
2015-06-16 14:06:35 +02:00 |
|
ddejongh
|
8d73e4a77b
|
edit acl
editionnote
|
2015-06-16 14:01:53 +02:00 |
|
vrde
|
03f09b8c83
|
Rename fetch to requests to avoid name clashing
|
2015-06-16 13:48:48 +02:00 |
|
vrde
|
a247e111c0
|
Merge branch 'AD-421-add-signup-functionality'
Conflicts:
js/constants/api_urls.js
js/constants/application_constants.js
|
2015-06-16 10:58:41 +02:00 |
|
ddejongh
|
3784d53609
|
code review
|
2015-06-16 10:02:55 +02:00 |
|
Tim Daubenschütz
|
1c8ac24127
|
replace amazon links
|
2015-06-16 09:59:09 +02:00 |
|
Tim Daubenschütz
|
e2997891df
|
loading icon for piece list
|
2015-06-16 09:57:14 +02:00 |
|
Tim Daubenschütz
|
1ce9b90fff
|
Fix pagination on search bug
|
2015-06-16 09:27:04 +02:00 |
|
ddejongh
|
cf3b7f234d
|
password reset ok
|
2015-06-15 16:56:17 +02:00 |
|
Tim Daubenschütz
|
8ceabda1c5
|
add queryparams modal
|
2015-06-15 15:46:33 +02:00 |
|
ddejongh
|
56d32efcc0
|
password reset
modal switch problems
|
2015-06-15 15:28:53 +02:00 |
|
ddejongh
|
66f8a6a1ca
|
login/logout functional
|
2015-06-15 12:36:27 +02:00 |
|
ddejongh
|
aac8ae2a9e
|
merged master
|
2015-06-15 11:02:49 +02:00 |
|
Tim Daubenschütz
|
6e7037e5f2
|
Finish implementing refactor for open and close for edition lists
|
2015-06-15 09:29:34 +02:00 |
|
root
|
9cc70dc4c9
|
refactor open state of edition table first cut
|
2015-06-12 17:18:40 +02:00 |
|
Tim Daubenschütz
|
2bb004d2fb
|
remove edition list count in table
|
2015-06-12 15:00:26 +02:00 |
|
Tim Daubenschütz
|
dcd770ab5f
|
readd sourcemaps
|
2015-06-12 13:36:55 +02:00 |
|
ddejongh
|
0f1108b14e
|
form password + signup
|
2015-06-11 17:22:11 +02:00 |
|
ddejongh
|
5e7f7983e1
|
application constants
|
2015-06-11 15:57:19 +02:00 |
|
ddejongh
|
f4c6e025ae
|
Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
js/constants/api_urls.js
js/constants/application_constants.js
|
2015-06-11 15:54:50 +02:00 |
|
ddejongh
|
4f5e7a0821
|
login form
|
2015-06-11 15:35:18 +02:00 |
|
ddejongh
|
bf0a2aeefb
|
consign unconsign requests
async emails
|
2015-06-11 15:03:55 +02:00 |
|
ddejongh
|
af71196dfd
|
delete function for multi editions
|
2015-06-10 15:49:46 +02:00 |
|
ddejongh
|
9241d3e38f
|
further details functional / unstyled
|
2015-06-09 17:24:06 +02:00 |
|
ddejongh
|
509aa111ab
|
Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
gulpfile.js
added notifications
cleaned up proptypes
|
2015-06-09 16:10:38 +02:00 |
|
vrde
|
5445698eea
|
[wip] add temporary base url
|
2015-06-09 16:10:25 +02:00 |
|
ddejongh
|
30ee436f4c
|
Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
gulpfile.js
added notifications
cleaned up proptypes
|
2015-06-09 16:09:59 +02:00 |
|
Tim Daubenschütz
|
669f2b3ae7
|
resolve merge conflict
|
2015-06-09 13:38:01 +02:00 |
|
Tim Daubenschütz
|
296176572e
|
add different kinds of notifications
|
2015-06-09 13:36:09 +02:00 |
|
ddejongh
|
6563bf97b0
|
toggable textarea
|
2015-06-09 13:29:22 +02:00 |
|
Tim Daubenschütz
|
d3fc902411
|
add que functionality to globalnotification
|
2015-06-09 12:08:14 +02:00 |
|
Tim Daubenschütz
|
e0e75151e0
|
add first working prototype
|
2015-06-08 18:14:25 +02:00 |
|
vrde
|
f732cec523
|
Merge branch 'AD-432-put-onion-online'
Conflicts:
gulpfile.js
package.json
|
2015-06-08 18:00:17 +02:00 |
|
vrde
|
a1bfbb8f86
|
[wip] add server to serve app
|
2015-06-08 15:24:58 +02:00 |
|
Tim Daubenschütz
|
b49f3fe9f2
|
set state bug fix
|
2015-06-08 14:51:13 +02:00 |
|
Tim Daubenschütz
|
8a17208643
|
fix bulk modal bug
|
2015-06-08 14:23:19 +02:00 |
|
Tim Daubenschütz
|
98d26f5ed7
|
fix minor checkbox bug
|
2015-06-08 14:13:35 +02:00 |
|
Tim Daubenschütz
|
b2241c0551
|
fix bulk action modal formating
|
2015-06-08 14:01:47 +02:00 |
|
Tim Daubenschütz
|
851d42e1d9
|
quick fix
|
2015-06-05 16:23:16 +02:00 |
|
Tim Daubenschütz
|
95f4efa92d
|
merge conflict
|
2015-06-05 16:21:36 +02:00 |
|
Tim Daubenschütz
|
443829320f
|
add personal note to piece detail page
|
2015-06-05 16:20:28 +02:00 |
|
Tim Daubenschütz
|
3a812e531d
|
fix search bug
|
2015-06-05 15:17:35 +02:00 |
|
Tim Daubenschütz
|
7f82d49278
|
resolve merge
|
2015-06-05 14:29:37 +02:00 |
|
Tim Daubenschütz
|
76a41a23b9
|
add details to piece detail page
|
2015-06-05 14:22:02 +02:00 |
|
vrde
|
62cc6b41df
|
Lint code
|
2015-06-05 14:14:59 +02:00 |
|
vrde
|
e8627cd0a3
|
Merge branch 'master' into AD-412-mediaplayer
Conflicts:
js/components/ascribe_media/resource_viewer.js
js/components/edition_container.js
js/mixins/inject_in_head_mixin.js
package.json
|
2015-06-05 13:18:16 +02:00 |
|
vrde
|
a4b3438a2d
|
Add shmui to handle images
|
2015-06-05 13:15:31 +02:00 |
|
Tim Daubenschütz
|
a7478cdcb5
|
resolve merge conflicts
|
2015-06-05 11:40:49 +02:00 |
|
Tim Daubenschütz
|
18a2806fb1
|
minor fixes
|
2015-06-05 11:32:10 +02:00 |
|
Tim Daubenschütz
|
f987bce7cc
|
add es6lint to build process and fix most (not really) errors and warnings
|
2015-06-05 11:06:36 +02:00 |
|
vrde
|
8f65aa7a2d
|
Add "other" type display
|
2015-06-04 17:37:46 +02:00 |
|
Tim Daubenschütz
|
c177b95f45
|
responsive table
|
2015-06-04 17:28:14 +02:00 |
|
vrde
|
ff6855970e
|
Still working on image preview
|
2015-06-04 17:23:40 +02:00 |
|
Tim Daubenschütz
|
6f73f1ebfd
|
refactor table to bootstrap table
|
2015-06-04 17:21:38 +02:00 |
|
Tim Daubenschütz
|
6aa74d6b42
|
fix separation of orderings in edtionLists
|
2015-06-04 16:41:14 +02:00 |
|
vrde
|
13caad7794
|
Refactor and restyle
|
2015-06-04 16:15:59 +02:00 |
|
Tim Daubenschütz
|
4fd5cdcdb5
|
add real href to edition list
|
2015-06-04 16:07:37 +02:00 |
|
Tim Daubenschütz
|
6da18e9a85
|
rename mergeOptions
|
2015-06-04 15:38:15 +02:00 |
|
Tim Daubenschütz
|
8a3ff445ef
|
use mergeOptionsList on all react components
|
2015-06-04 15:33:59 +02:00 |
|
Tim Daubenschütz
|
1230ae7192
|
add handle success functionality to piece list and implement onject merger for components with multiple stores
|
2015-06-04 15:30:21 +02:00 |
|
vrde
|
d44cf295f0
|
Merge remote-tracking branch 'origin/master' into piece-detail-mediaplayer
Conflicts:
js/components/ascribe_media/resource_viewer.js
|
2015-06-04 14:12:29 +02:00 |
|
Tim Daubenschütz
|
a93634f010
|
add transition model and callback for closing the edition list of a piece after changing route
|
2015-06-04 13:48:07 +02:00 |
|
Tim Daubenschütz
|
aaf393d48a
|
Merge branch 'master' into AD-410-finish-implementing-piecelist-pag
|
2015-06-04 13:18:32 +02:00 |
|
Tim Daubenschütz
|
c19a05ca50
|
fix setState bug by renaming componentDidUnmount to componentWillUnmount
|
2015-06-04 13:17:59 +02:00 |
|
Tim Daubenschütz
|
ccbf411168
|
fixed store bindings
|
2015-06-04 13:16:19 +02:00 |
|
Tim Daubenschütz
|
302f05b68e
|
add link functionality
|
2015-06-04 11:41:56 +02:00 |
|
Tim Daubenschütz
|
4fe5766bc4
|
add select all functionality for edition list table
|
2015-06-04 10:11:18 +02:00 |
|
Tim Daubenschütz
|
ef6662e859
|
add ordering functionality to editionlist table
|
2015-06-04 09:16:30 +02:00 |
|
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 |
|