Cevo
|
eb4994b05e
|
add more
|
2015-09-03 18:25:12 +02:00 |
|
diminator
|
6a1f58fdb4
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-03 17:37:40 +02:00 |
|
Cevo
|
57c4076c1e
|
pushing the contract u[pdate on client side
|
2015-09-03 17:19:29 +02:00 |
|
Cevo
|
d2f8b658af
|
contract listing being done
|
2015-09-03 15:53:02 +02:00 |
|
diminator
|
9334251fd3
|
notifications on piece details (www, ikono, cyland) and edition details
|
2015-09-03 15:17:12 +02:00 |
|
diminator
|
edcd8e57a4
|
notification app
notification refactor in onion - split by piece/edition
|
2015-09-03 14:15:00 +02:00 |
|
diminator
|
92971a9f62
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
Conflicts:
sass/ascribe_accordion_list.scss
|
2015-09-02 10:50:33 +02:00 |
|
Tim Daubenschütz
|
af7938dbc7
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-01 09:29:58 +02:00 |
|
Tim Daubenschütz
|
55948bc9ba
|
integrate unfilteredPieceListCount into piece list store and list
|
2015-08-31 16:57:16 +02:00 |
|
Tim Daubenschütz
|
90f89e4498
|
other loan contract to contract renaming
|
2015-08-31 11:05:33 +02:00 |
|
Tim Daubenschütz
|
dd20afff90
|
rename LoanContract to Contract
|
2015-08-28 16:18:10 +02:00 |
|
diminator
|
d3cc6a5007
|
request actions first cut
|
2015-08-28 15:24:32 +02:00 |
|
diminator
|
ab97fa420c
|
loan request with moment
shortlist on accordeonlist OK
|
2015-08-26 15:46:27 +02:00 |
|
diminator
|
b2fed6426f
|
loan request up till accept
|
2015-08-26 09:50:38 +02:00 |
|
diminator
|
e933b334c2
|
loan contract form
|
2015-08-18 16:24:36 +02:00 |
|
Tim Daubenschütz
|
06f86b2a0e
|
first cut: test queue inheritance
|
2015-08-06 18:03:13 +02:00 |
|
diminator
|
36356dd5c5
|
Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
|
2015-08-05 14:52:18 +02:00 |
|
Tim Daubenschütz
|
23bbbb792a
|
pr review: clear: operators precedence
|
2015-08-04 16:58:36 +02:00 |
|
Tim Daubenschütz
|
fc0bccbff3
|
add filterBy to edition list action|store
|
2015-08-04 15:06:02 +02:00 |
|
diminator
|
2258968856
|
Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
Conflicts:
.gitignore
|
2015-08-04 11:45:20 +02:00 |
|
Tim Daubenschütz
|
e3b46c69a5
|
implement piece list filter widget functionality
|
2015-08-04 11:39:33 +02:00 |
|
Tim Daubenschütz
|
c9042a0934
|
delete password of user when submitting to sentry
|
2015-08-03 10:41:51 +02:00 |
|
Tim Daubenschütz
|
4f2aa430f2
|
refactor ascribe table and add prizes dashboard boilerplate code
|
2015-07-29 18:03:49 +02:00 |
|
Tim Daubenschütz
|
b0d3213816
|
add flushLoanContract logic
|
2015-07-29 15:03:15 +02:00 |
|
Tim Daubenschütz
|
76cf9fd74d
|
Merge branch 'AD-435-hash-locally-for-when-a-artist-do'
Conflicts:
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_slides_container/slides_container.js
js/components/ascribe_uploader/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
|
2015-07-29 09:35:14 +02:00 |
|
TimDaubenschuetz
|
78049b448e
|
Merged in AD-598-register-action-switches (pull request #14)
Ad 598 register action switches
|
2015-07-28 16:36:57 +02:00 |
|
diminator
|
3142e00ea5
|
Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do
|
2015-07-28 12:13:40 +02:00 |
|
vrde
|
c2601f242f
|
Comment events not yet implemented
|
2015-07-27 18:08:12 +02:00 |
|
vrde
|
4d93e076df
|
Add third party modules to handle tracking without polluting the code
|
2015-07-27 18:06:02 +02:00 |
|
Tim Daubenschütz
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +02:00 |
|
TimDaubenschuetz
|
90b0047eb8
|
Merged in AD-610-on-switching-edition-detail-coa-d (pull request #17)
Flush store after unmounting coa component to force refresh on new user request
|
2015-07-23 14:35:09 +02:00 |
|
TimDaubenschuetz
|
61077de3de
|
Merged in AD-591-finetune-build-process (pull request #13)
Ad 591 finetune build process
|
2015-07-22 15:19:35 +02:00 |
|
Tim Daubenschütz
|
c3a1b9b626
|
Flush store after unmounting coa component to force refresh on new user request
|
2015-07-22 15:16:56 +02:00 |
|
diminator
|
742c1bc6e0
|
coa fixes and bug report
|
2015-07-22 00:30:51 +02:00 |
|
Tim Daubenschütz
|
20a83167ab
|
slide container works now with browser history
|
2015-07-21 15:05:42 +02:00 |
|
Tim Daubenschütz
|
68dba56a21
|
refactor some scss variables and include css source map only in debug
|
2015-07-20 10:52:12 +02:00 |
|
Tim Daubenschütz
|
efd329c44c
|
patch logout behavior
|
2015-07-17 18:53:04 +02:00 |
|
Tim Daubenschütz
|
af42bb8e67
|
error handling first cut
|
2015-07-17 15:41:09 +02:00 |
|
Tim Daubenschütz
|
13e151e83b
|
add logging and responsive user navigation
|
2015-07-16 19:12:18 +02:00 |
|
Tim Daubenschütz
|
1509c520a4
|
finalizing loan form
|
2015-07-15 14:48:51 +02:00 |
|
Tim Daubenschütz
|
795a268184
|
loan form styling and loan contract store
|
2015-07-15 14:03:23 +02:00 |
|
Tim Daubenschütz
|
cc89475d0c
|
add routine to refresh specific edition list
|
2015-07-14 14:45:33 +02:00 |
|
Tim Daubenschütz
|
2d28c00d0f
|
display spinner on pagination request
|
2015-07-13 19:12:24 +02:00 |
|
Tim Daubenschütz
|
85ba816a53
|
separate polling-success functionality
|
2015-07-13 18:13:16 +02:00 |
|
Tim Daubenschütz
|
fd094aa471
|
remove first edition routine
|
2015-07-13 14:49:39 +02:00 |
|
Tim Daubenschütz
|
1df068d75f
|
add edition creation functionality
|
2015-07-10 13:54:25 +02:00 |
|
Tim Daubenschütz
|
773d42a3b8
|
add firstEdition to a piece
|
2015-07-09 15:44:20 +02:00 |
|
Tim Daubenschütz
|
ad833a53dc
|
fix loading feedback for piece list
|
2015-07-07 09:22:46 +02:00 |
|
Tim Daubenschütz
|
7863431727
|
add toggle for show more
|
2015-07-06 15:56:14 +02:00 |
|
Tim Daubenschütz
|
e10b56cfc7
|
first cut pagination for editions
|
2015-07-03 16:31:09 +02:00 |
|
diminator
|
4ca2144c0c
|
request actions in frontend
|
2015-07-01 19:05:47 +02:00 |
|
Tim Daubenschütz
|
9ce6c45690
|
add sessions for already uploaded files and implement manual deletion
|
2015-06-30 15:41:39 +02:00 |
|
diminator
|
8fc400bb01
|
licenses in registration
|
2015-06-30 10:42:58 +02:00 |
|
diminator
|
f3677501c1
|
whitelabel subdomains
|
2015-06-29 15:58:47 +02:00 |
|
diminator
|
fba30a565b
|
coa renders per page
verify
|
2015-06-25 14:39:39 +02:00 |
|
ddejongh
|
9e1a76a08e
|
api settings complete
|
2015-06-22 17:33:25 +02:00 |
|
ddejongh
|
23190f6c48
|
signup/login
|
2015-06-20 16:43:18 +02:00 |
|
ddejongh
|
fabff2922c
|
account settings
|
2015-06-17 17:48:23 +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
|
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
|
62cc6b41df
|
Lint code
|
2015-06-05 14:14:59 +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 |
|
Tim Daubenschütz
|
6aa74d6b42
|
fix separation of orderings in edtionLists
|
2015-06-04 16:41:14 +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
|
ef6662e859
|
add ordering functionality to editionlist table
|
2015-06-04 09:16:30 +02:00 |
|
Tim Daubenschütz
|
0ef0558e3f
|
merge localization
|
2015-06-02 15:38:54 +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
|
53a01115f2
|
put show state of item list in store to fix bug
|
2015-06-02 15:33:48 +02:00 |
|
Tim Daubenschütz
|
68be98c3f0
|
integrate string formating functionality
|
2015-06-02 13:31:12 +02:00 |
|
vrde
|
699c07fe3f
|
Merge branch 'master' into AD-351-refactor-fetch
|
2015-06-01 16:45:40 +02:00 |
|
Tim Daubenschütz
|
8a18d894cc
|
add clear selection functionality
|
2015-06-01 15:12:31 +02:00 |
|
vrde
|
f50d28be98
|
Refactor fetch, WIP
|
2015-06-01 14:22:04 +02:00 |
|
ddejongh
|
b8ffac4275
|
merge table branch
|
2015-05-29 09:20:01 +02:00 |
|
Tim Daubenschütz
|
92be6a63e8
|
select state is saved in the store
|
2015-05-26 16:48:48 +02:00 |
|
ddejongh
|
230ecfb0e4
|
modal try 1
|
2015-05-26 16:46:02 +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
|
5f492ff13b
|
add foldable editions table
|
2015-05-26 13:14:35 +02:00 |
|
Tim Daubenschütz
|
1cb0b54f77
|
Added PieceDetail boilerplate code
|
2015-05-26 10:41:41 +02:00 |
|
Tim Daubenschütz
|
0927d021c9
|
put architecture for transcluding TableItem in place
|
2015-05-22 18:41:15 +02:00 |
|
Tim Daubenschütz
|
4c0e7992f4
|
Inject elements-to-transclude in the table
|
2015-05-22 16:51:08 +02:00 |
|
Tim Daubenschütz
|
654d9b93c3
|
Implement more pagination functionality
|
2015-05-22 13:43:53 +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
|
0a2895e0d6
|
Pagination works, it still needs some love
|
2015-05-21 17:54:27 +02:00 |
|
Tim Daubenschütz
|
9506cf3b1b
|
implement ordering
|
2015-05-21 12:12:25 +02:00 |
|
Tim Daubenschütz
|
a4a4482d18
|
start implementing sort
|
2015-05-20 19:19:57 +02:00 |
|
vrde
|
8ee9bda37b
|
Fix spacing
|
2015-05-20 16:44:45 +02:00 |
|
vrde
|
0527e0184e
|
Work on UserStuff
|
2015-05-20 16:19:40 +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
|
adb4c72253
|
Remove superagent, add isomorphic fetch instead again, add constants as well as utility functions
|
2015-05-19 13:45:19 +02:00 |
|
vrde
|
4da72d8846
|
Load some pieces from API endpoint
|
2015-05-19 10:16:44 +02:00 |
|
Tim Daubenschütz
|
8d57962f07
|
Fix bind bug
|
2015-05-19 08:57:42 +02:00 |
|