1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-30 13:41:57 +02:00
Commit Graph

163 Commits

Author SHA1 Message Date
Brett Sun
6cc9ce8094 Don't redirect to register piece and then to contract notifications
Avoids new user getting asked if they want to cancel registration of a
piece before they even agree to the Ikono contract.
2015-12-14 18:34:27 +01:00
Tim Daubenschütz
2cc02d9599 Increase robustness of coa fetching routine 2015-12-08 14:18:31 +01:00
Tim Daubenschütz
da75353b00 Refactor Edition endpoints to create Coa on demand properly 2015-12-08 13:28:47 +01:00
Tim Daubenschütz
bf6b78c058 Revert "coa flush causes dispatcherror"
This reverts commit eaed301155.
2015-12-08 11:49:03 +01:00
diminator
eaed301155 coa flush causes dispatcherror 2015-12-08 11:46:30 +01:00
Tim Daubenschütz
23556b1b4c Merge pull request #34 from ascribe/add-pause-resume-to-global-notifications
Implement pause and resume functionality to global notifications
2015-12-07 17:22:02 +01:00
Tim Daubenschütz
2b6b78310c Merge pull request #1 from ascribe/AD-1177-display-404-on-pieces-and-editio
AD-1177 display 404 on pieces and editio
2015-12-07 11:49:39 +01:00
Brett Sun
3c516c1598 Refactor contract agreement to be a self contained component that can be used in forms 2015-12-03 15:22:17 +01:00
Tim Daubenschütz
5a6c827f0b Merge branch 'master' into AD-1177-display-404-on-pieces-and-editio
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/ascribe_detail/piece_container.js
2015-11-30 15:00:39 +01:00
Tim Daubenschütz
7146f00c05 Refactor webhooks: add source, clear state on create hide create on no items left 2015-11-27 13:36:42 +01:00
diminator
1c25f8e776 webhooks in settings without acl 2015-11-27 03:24:37 +01:00
Brett Sun
6649b7d7f1 Implement pause and resume functionality to global notifications
Also part of this change:
* Handle the notification cooldown periods using status changes rather
than emptying the queue
* Refactor how notifications are rendered
2015-11-21 19:23:20 +01:00
Tim Daubenschütz
f8c923daec Adjust naming for promise-based callback functions in sources 2015-11-16 17:16:13 +01:00
Tim Daubenschütz
35e9bedf04 Convert WhitelabelFetcher to WhitelabelSource 2015-11-03 10:07:44 +01:00
Tim Daubenschütz
f0325f2473 Specify and applying naming conventions 📃 for source and store methods 2015-11-02 16:32:55 +01:00
Tim Daubenschütz
7ce7f4d17d Completing prototype for using alt.js's sources instead of fetchers 2015-11-02 15:47:57 +01:00
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
f82278070b Log before dispatch in PieceActions 2015-10-19 16:01:05 +02: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
TimDaubenschuetz
d66c201a98 Merged in AD-727-missing-redirects-to-login-page (pull request #95)
Ad 727 missing redirects to login page
2015-10-19 10:13:54 +02:00
Tim Daubenschütz
f57125184d Merge remote-tracking branch 'origin/master' into AD-744-search-filter-not-working-i-type- 2015-10-12 17:35:48 +02:00
Tim Daubenschütz
c59f5267ce add threshold functionality to SearchBar 2015-10-12 16:38:00 +02:00
Tim Daubenschütz
02eafaa80c Isolate SearchBar from PieceListToolbar and start implement threshold logic 2015-10-12 13:57:37 +02:00
Tim Daubenschütz
1c48b8b828 Merge branch 'master' into AD-744-search-filter-not-working-i-type- 2015-10-12 11:06:47 +02:00
Tim Daubenschütz
471d95977e Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page 2015-10-07 09:31:49 +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
fbc9ae1fe7 Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page
Conflicts:
	js/third_party/notifications.js
2015-10-06 16:50:51 +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
28dfcfa75a Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
	js/components/ascribe_detail/edition.js
	js/components/ascribe_forms/form_login.js
	js/components/ascribe_forms/form_signup.js
2015-10-06 16:40:02 +02:00
TimDaubenschuetz
ccc7bf9c06 Merged in AD-992-im-on-page-3-i-deleted-an-edition (pull request #86)
Ad 992 im on page 3 i deleted an edition
2015-09-30 17:48:12 +02:00
diminator
55f5d959ff PR fixes 2015-09-30 11:26:31 +02:00
Tim Daubenschütz
7283ae7574 PR Feedback: Change API error handling to saver approach 2015-09-30 11:22:20 +02:00
diminator
ea4805caa0 create CoA when not found 2015-09-30 09:14:57 +02:00
Tim Daubenschütz
1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
Tim Daubenschütz
652df66cb3 Fix some issues with smelly code 2015-09-21 14:22:52 +02:00
Tim Daubenschütz
0819724a10 probably fix dispatch.dispatch error + showing wrong piece data bug 2015-09-21 10:57:10 +02:00
Tim Daubenschütz
2cbf7d0095 Implement PR Feedback 2015-09-18 14:12:50 +02:00
Tim Daubenschütz
780ab9f7f1 Cleanup window.setTimeout 2015-09-17 13:28:59 +02:00
diminator
63fffc2132 PR comments fix 2015-09-17 11:39:55 +02:00
diminator
b24d4608dd Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-16 15:59:07 +02:00
diminator
d6bd4b4ac1 bug fix acl button
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
2015-09-16 14:07:13 +02:00
Tim Daubenschütz
17cb2223c2 finalize contract update button 2015-09-16 09:47:22 +02:00
diminator
71f94768d9 fix PR comments 2015-09-15 13:22:52 +02:00
diminator
0ce298879b fixed tests
refactored contractagreement actions
2015-09-14 17:53:50 +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
17f7be9257 contract list make public 2015-09-09 11:11:16 +02:00
diminator
2a92b38a9a Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 2015-09-08 14:43:38 +02:00