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

2110 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
Brett Sun
38ef18a192 Hotfix for sending contract agreements without appendices 2015-12-11 11:15:17 +01:00
Brett Sun
6e9b1ac181 Hotfix for header accessing undefined ref
Sometimes `onRouteChange()` is triggered before the component’s refs
are available, so we have to check for them before setting their state.
2015-12-10 19:19:01 +01:00
Dimitri De Jonghe
b467a840a4 Merge pull request #53 from ascribe/AD-1362-implement-portfolioreview-judging-flow
Implement first cut of judging flow for portfolio review
2015-12-10 16:58:42 +01:00
Brett Sun
b9e41d5cba Use mergeOptions instead of Object.assign when merging sources to check for clashes 2015-12-10 15:42:33 +01:00
Brett Sun
b126de5c2d Add empty object defaults to stores that use sources
Avoids inconsistent state where the store might set `null` or
`undefined` due to the server’s response
2015-12-10 15:41:55 +01:00
Brett Sun
268cbd55ad Add logout link to submitted piece's hero component 2015-12-10 15:15:56 +01:00
Brett Sun
c9d330c2bd Merge branch 'AD-1362-implement-portfolioreview-judging-flow' of github.com:ascribe/onion into AD-1362-implement-portfolioreview-judging-flow 2015-12-10 14:45:17 +01:00
diminator
51ff0295c0 refactor prize app to be compliant with whitelabel settings 2015-12-10 14:07:05 +01:00
Brett Sun
7cc51f81d0 Fix user fetch dispatch collision since the PieceContainer also fetches the user 2015-12-10 12:42:23 +01:00
Brett Sun
9b99e3ae09 Fix PR comments 2015-12-10 11:11:37 +01:00
diminator
3461a28f36 Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow 2015-12-09 16:48:33 +01:00
Tim Daubenschütz
dcca228669 Merge pull request #57 from ascribe/AD-290-coa-buttons-and-usage-esp-verify
Refactor COA to refresh accordingly on remount of edition page
2015-12-09 15:57:00 +01:00
Tim Daubenschütz
02af024609 Cosmetic changes in EditionContainer and CoaVerifyContainer 2015-12-09 15:56:47 +01:00
diminator
00154196a4 Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow 2015-12-09 15:12:01 +01:00
Dimitri De Jonghe
c13ad64e57 Merge pull request #63 from ascribe/fix-spinner-centering
Fix spinner being off-center
2015-12-09 15:10:39 +01:00
Brett Sun
7525683aad Fix spinner being off-center 2015-12-09 14:46:34 +01:00
Brett Sun
7605f093ab Fix Request error case 2015-12-09 14:44:31 +01:00
Tim Daubenschütz
b31872261d Add AuthPrizeRoleRedirect to missing routes 2015-12-09 14:00:00 +01:00
Tim Daubenschütz
0b63801d33 Merge branch 'master' into AD-1362-implement-portfolioreview-judging-flow 2015-12-09 13:49:40 +01:00
Tim Daubenschütz
3e8e7a40e7 Fix setState warning for EditionContainer 2015-12-09 13:28:11 +01:00
Tim Daubenschütz
057a278d19 In EditionStore use empty object instead of null as default state 2015-12-09 13:21:55 +01:00
Tim Daubenschütz
2a251897d5 Split EditionSource up into CoaSource and EditionSource 2015-12-09 13:18:07 +01:00
Tim Daubenschütz
fb8111fadc Merge branch 'AD-290-coa-buttons-and-usage-esp-verify' of github.com:ascribe/onion into AD-290-coa-buttons-and-usage-esp-verify 2015-12-09 13:04:27 +01:00
Tim Daubenschütz
03481f3b09 Fix bug: Old edition HTTP request holds loading data for new edition request 2015-12-09 13:04:15 +01:00
diminator
02a9844ed7 Merge remote-tracking branch 'remotes/origin/master' into AD-290-coa-buttons-and-usage-esp-verify 2015-12-09 11:42:22 +01:00
diminator
7318d4e5df embed in edition 2015-12-09 11:41:46 +01:00
Tim Daubenschütz
de3d3e937e Throw no 'Client Request Error' when body.success is not available 2015-12-09 11:24:11 +01:00
diminator
4e3cf47d3f Merge branch 'AD-290-coa-buttons-and-usage-esp-verify' of github.com:ascribe/onion into AD-290-coa-buttons-and-usage-esp-verify 2015-12-08 18:17:30 +01:00
diminator
8226011e8a query_params in coa_verify 2015-12-08 18:17:08 +01:00
Tim Daubenschütz
e240443e7a Add 23vivi to README.md 2015-12-08 17:58:43 +01:00
Tim Daubenschütz
4727646654 Add nice message for waiting user 2015-12-08 17:43:19 +01:00
Tim Daubenschütz
e8d5e0390d Improve robustness for server-side failing requests for COA 2015-12-08 17:38:04 +01:00
Tim Daubenschütz
cbf253adec Merge pull request #58 from ascribe/rename-ascribe-logo-font-to-ascribe-font
Move ascribe-logo.* files to ascribe-font.*
2015-12-08 17:24:52 +01:00
Tim Daubenschütz
02bb72970d Merge pull request #52 from ascribe/AD-1428-add-link-to-portfolio-review-website
Add link to portfolio review website to registration form
2015-12-08 17:23:31 +01:00
Tim Daubenschütz
0868d4ce70 Merge pull request #55 from ascribe/fix-spinner-centering
Use line-height to center spinner-inner
2015-12-08 17:22:51 +01:00
Tim Daubenschütz
2e51e1e1eb Merge pull request #62 from ascribe/AD-1485-add-faq-link-to-footer
Add FAQ to footer
2015-12-08 17:22:31 +01:00
Brett Sun
f9e7355704 Add FAQ to footer 2015-12-08 17:18:03 +01:00
Tim Daubenschütz
32bc4b0c69 Add custom styling for PR 2015-12-08 16:43:45 +01:00
Brett Sun
049371cc1b Move ascribe-logo.* to ascribe-font.*
Also add the thin cross icon
2015-12-08 15:45:00 +01:00
Tim Daubenschütz
7e5662676c Add header to jury, judge and admin role 2015-12-08 15:44:46 +01:00
Tim Daubenschütz
e427429263 Implement AuthPrizeRoleRedirect 2015-12-08 15:21:20 +01:00
Tim Daubenschütz
2cc02d9599 Increase robustness of coa fetching routine 2015-12-08 14:18:31 +01:00
Brett Sun
57c85198ed Use line-height to center spinner-inner 2015-12-08 13:33:41 +01:00
Tim Daubenschütz
da75353b00 Refactor Edition endpoints to create Coa on demand properly 2015-12-08 13:28:47 +01:00
Brett Sun
847b59366c Merge pull request #54 from ascribe/AD-1481-change-23vivi-name-to-uppercase
Change frontend instances of 23vivi to be uppercase
2015-12-08 13:24:31 +01:00
Brett Sun
8f3d8fafa6 Change fronted instances of 23vivi to be uppercase 2015-12-08 12:04:01 +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
50377ba478 Generalize ProxyHandler to take arbitrary redirect functions 2015-12-08 11:17:04 +01:00