1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
Commit Graph

158 Commits

Author SHA1 Message Date
Tim Daubenschütz
469f5108a8 Implement cached source for user endpoint 2015-10-30 16:57:03 +01:00
Tim Daubenschütz
bed067f9bc Add first cut on persistent stores 2015-10-29 17:15:26 +01:00
Tim Daubenschütz
757ee40e4e add 404 routine to PieceContainer 2015-10-19 15:58:05 +02:00
Tim Daubenschütz
23b7ebd776 add 404 routine to EditionContainer 2015-10-19 15:29:57 +02:00
diminator
c24021302f Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_hero.js
2015-10-14 17:25:53 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
Tim Daubenschütz
f5c06e070c Separate dispatcher logic of whitelabel and user stores 2015-10-07 09:31:38 +02:00
Tim Daubenschütz
000719e14d Move third party actions/stores to separate dispatcher 2015-10-06 16:47:59 +02:00
Tim Daubenschütz
40095f7fbf throw javascript errors on >= 400 HTTP errors 2015-09-29 15:38:06 +02:00
diminator
ef22707680 create public agreement 2015-09-11 18:23:31 +02:00
diminator
23eb3a7fd9 Fetch contractagreements, order them and filter by accepted or pending
Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan-

Conflicts:
	ownership/serializers.py
2015-09-10 20:20:42 +02:00
diminator
22aa0139ae terms and conditions page with accept/deny
Needed: copyright societies in backend
2015-09-07 12:03:59 +02:00
diminator
9b7a69bc20 contract agreement notifications 2015-09-04 11:49:55 +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
diminator
bfaf4886a4 notifications unoptimized 2015-09-01 14:45:14 +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
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
bbb0bb15b6 add documentation 2015-08-07 13:20:31 +02:00
Tim Daubenschütz
ada7df25a7 fix minor consistence bug 2015-08-07 13:18:33 +02:00
Tim Daubenschütz
192f776bd8 Filter open edition tables correctly 2015-08-07 13:05:50 +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
c4e372e72f pr review: fix indentation 2015-08-04 16:18:14 +02:00
Tim Daubenschütz
fc0bccbff3 add filterBy to edition list action|store 2015-08-04 15:06:02 +02:00
Tim Daubenschütz
e3b46c69a5 implement piece list filter widget functionality 2015-08-04 11:39:33 +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
9ebc489c78 refresh piece list correctly after piece with edition creation 2015-07-29 15:24:30 +02:00
Tim Daubenschütz
b0d3213816 add flushLoanContract logic 2015-07-29 15:03:15 +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
2ff47ede89 replace console logs with global logging 2015-07-17 15:52:53 +02:00
Tim Daubenschütz
e9ea24aed3 add support for zero editions in piece list 2015-07-16 12:11:05 +02:00
Tim Daubenschütz
39ec4c5b91 fix wrong feedback for deleting an edition 2015-07-16 11:50:52 +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
5ec54f4324 add icons 2015-07-06 17:07:41 +02:00
Tim Daubenschütz
7863431727 add toggle for show more 2015-07-06 15:56:14 +02:00
Tim Daubenschütz
f12a57c3cf fix merging on ACL action 2015-07-06 15:42:04 +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
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
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
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
ddejongh
4e1ef9fc72 Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 2015-06-15 09:59:53 +02:00
Tim Daubenschütz
6e7037e5f2 Finish implementing refactor for open and close for edition lists 2015-06-15 09:29:34 +02:00
Tim Daubenschütz
989b121678 Fix mangling issue 2015-06-15 08:44:44 +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
ddejongh
bf0a2aeefb consign unconsign requests
async emails
2015-06-11 15:03:55 +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
Tim Daubenschütz
98d26f5ed7 fix minor checkbox bug 2015-06-08 14:13:35 +02:00
Tim Daubenschütz
a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +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
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
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
0747c89a35 documenting known issue with open/close state of edition list table 2015-06-04 10:25:31 +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
Tim Daubenschütz
28a1c8f2d4 fix modal undefined bug 2015-06-03 11:49:39 +02:00
Tim Daubenschütz
95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
Tim Daubenschütz
0ef0558e3f merge localization 2015-06-02 15:38:54 +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
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
Tim Daubenschütz
8a18d894cc add clear selection functionality 2015-06-01 15:12:31 +02:00
Tim Daubenschütz
7c4d4afbd4 add checkbox select functionality 2015-06-01 14:10:11 +02:00
ddejongh
b8ffac4275 merge table branch 2015-05-29 09:20:01 +02:00
Tim Daubenschütz
d71e6baa19 add persistent selected rows 2015-05-26 17:25:03 +02:00
Tim Daubenschütz
92be6a63e8 select state is saved in the store 2015-05-26 16:48:48 +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
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