1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Commit Graph

183 Commits

Author SHA1 Message Date
Brett Sun
5b7a5de332 Merge with master 2016-01-19 17:02:04 +01:00
Brett Sun
dbdef3ce6b Merge branch 'master' into AD-1452-share-to-facebook-not-loaded 2016-01-19 10:18:52 +01:00
Brett Sun
3587a7ae4f Merge pull request #102 from ascribe/remove-unused-prize-list-components
Remove unused PrizeList store and action
2016-01-18 18:29:44 +01:00
Brett Sun
aa00415a83 Merge with master 2016-01-18 14:15:19 +01:00
Brett Sun
78cf40ba64 Small cosmetic changes 2016-01-18 10:53:01 +01:00
Brett Sun
a2320b892d Merge with master 2016-01-18 10:40:13 +01:00
Brett Sun
d805c1758c Merge pull request #60 from ascribe/AD-1443-open-edition-lists-not-refreshing
AD-1443 Attempt to show as much of the original edition list as possible on refresh
2016-01-18 10:26:51 +01:00
Brett Sun
bc17dd4bad Small cosmetic changes 2016-01-18 10:17:49 +01:00
Brett Sun
7136f2ce6c Add getInitialState and source pattern for PieceStore 2016-01-14 13:20:45 +01:00
Brett Sun
a5442e5acd Add getInitialState pattern for EditionStore 2016-01-13 17:24:32 +01:00
Brett Sun
72db69ee9e Remove unused PrizeList store and action 2016-01-13 16:17:31 +01:00
Brett Sun
cf6dbb26f3 Fix loading of Facebook share button 2016-01-06 15:13:09 +01:00
Brett Sun
5a497bae59 Small cleanups and fixes for spacing, unused props, etc 2015-12-21 11:44:13 +01:00
Brett Sun
0f8094ef55 Merge pull request #69 from ascribe/AD-1346-hide-piece-registration-if-cant-submit
AD-1346 Hide piece registration if user cannot submit to whitelabel
2015-12-17 16:44:25 +01:00
Brett Sun
b6ca964adb Fix contractAgreementList not updating correctly after initial creation 2015-12-17 11:01:49 +01:00
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
Brett Sun
08cc88c699 Fix shorthand property ordering 2015-12-09 18:03:52 +01:00
Brett Sun
b02f6d7695 Merge with master 2015-12-08 16:11:27 +01:00
Brett Sun
257ff9b5d3 Destructure params for fetchPieceList 2015-12-08 15:09:03 +01:00
Brett Sun
349ea8518f Destructure params for fetchEditionList 2015-12-08 14:55:04 +01:00
Tim Daubenschütz
2cc02d9599 Increase robustness of coa fetching routine 2015-12-08 14:18:31 +01:00
Brett Sun
4fa25ca446 Add option to specify the max edition to fetch and update the edition list to 2015-12-08 13:41:15 +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