ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,537 Commits 115 Branches 0 Tags 13 MiB
2967a29f2e
Commit Graph

129 Commits

Author SHA1 Message Date
vrde
84d2dd7701 Add document title for prize 2015-10-13 17:02:03 +02:00
vrde
7c231a4c5e Restore baseUrl in router 2015-10-13 14:19:08 +02:00
vrde
12d3fb289e Rename RedirectProxyHandler to AuthProxyHandler 2015-10-12 17:00:53 +02:00
vrde
04abf31354 Remove ProxyRoute 2015-10-12 16:51:18 +02:00
Tim Daubenschütz
69afc6165a Incorporate new RedirectProxyRoute into whitelabel pages 2015-10-09 15:19:24 +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
8ba6f11dfe Fix AccordionListTable item links and missing location propagation 2015-10-01 14:54:56 +02:00
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
17fd470e6b Upgrade react-router-bootstrap 2015-10-01 14:00:56 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
Tim Daubenschütz
8cd4377a58 Change links in app to new react-router@1.0rc1 syntax 2015-09-30 18:30:50 +02:00
Tim Daubenschütz
eebe936023 Change: router rendering, router location, route configs, notFound routes, redirect routes, 2015-09-30 17:09:46 +02:00
TimDaubenschuetz
ad7f088081 Merged in AD-605-when-an-edition-or-piece-is-not-d (pull request #90) 
Ad 605 when an edition or piece is not d
 2015-09-30 11:15:22 +02:00
Tim Daubenschütz
90cf137c2c Integrate error page in app + whitelabel pages 2015-09-29 16:00:58 +02:00
Tim Daubenschütz
d50d0faabe Write generic function for extracting subdomain and implement troughout whole app 2015-09-29 14:58:56 +02:00
diminator
db1ef91965 bug fix filterParams=null on sluice 2015-09-28 16:29:50 +02:00
Tim Daubenschütz
cfab59c027 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-25 16:23:22 +02:00
Tim Daubenschütz
f2b4c23bd7 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Conflicts:
	js/routes.js
 2015-09-25 16:23:01 +02:00
diminator
e6a6c2c2a3 set collapsible default show=true 2015-09-25 15:33:01 +02:00
Tim Daubenschütz
e20e378533 Remove PrizeDashboard from codebase, add coa_verify to prize app 2015-09-25 11:54:12 +02:00
Tim Daubenschütz
90d6ec20f6 Revert "Revert "acls on 3 levels"" 
This reverts commit c02d1ea3ac.
 2015-09-22 17:38:25 +02:00
Tim Daubenschütz
c02d1ea3ac Revert "acls on 3 levels" 
This reverts commit f1bc400faf.
 2015-09-22 17:29:07 +02:00
diminator
f1bc400faf acls on 3 levels 
whitelabel
user
piece

the higher on the list, the more power (whitelabel overrides user and piece)
 2015-09-22 17:23:19 +02:00
Tim Daubenschütz
c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
vrde
b76ffcde73 Finish styling for landing page 2015-09-18 13:46:15 +02:00
diminator
6013303bd6 Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra 
Conflicts:
	js/components/ascribe_buttons/button_submit_close.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	sass/ascribe_media_player.scss
	sass/main.scss
 2015-09-10 17:45:51 +02:00
Tim Daubenschütz
b5e5102ea4 replace in keyword with dot notation checking 2015-09-10 14:00:59 +02:00
diminator
73ee0753c1 refactored notifications per detail 2015-09-03 17:25:22 +02:00
diminator
9334251fd3 notifications on piece details (www, ikono, cyland) and edition details 2015-09-03 15:17:12 +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
b5b1e36109 nested collapsible paragraphs 2015-09-01 14:00:06 +02:00
Tim Daubenschütz
56cdcdb5c6 Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra 2015-09-01 13:30:04 +02:00
vrde
d2adc7a388 Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss 
Conflicts:
	sass/main.scss
 2015-08-31 19:09:09 +02:00
Tim Daubenschütz
7e1815bb1f refactor account settings into multiple files 2015-08-31 16:36:24 +02:00
vrde
3f34fc680e Get rid of ascribe-btn-gray 2015-08-28 16:40:54 +02:00
diminator
762c3f89b9 Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col 2015-08-28 15:25:43 +02:00
diminator
d3cc6a5007 request actions first cut 2015-08-28 15:24:32 +02:00
Tim Daubenschütz
9d7a9bd028 add router/navigation integration into whole project 2015-08-27 14:34:15 +02:00
diminator
bc28f3d8f5 loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
diminator
8406272187 review comments 2015-08-27 10:18:50 +02:00
diminator
33d5480f2f review comments 2015-08-27 10:10:39 +02:00
diminator
1f95ae3a41 show email of user registered on select 2015-08-27 09:21:48 +02:00
diminator
65571848fb ordering by selected 2015-08-26 17:41:36 +02:00
diminator
19c882f3b4 reveal name on shortlist in list 2015-08-26 16:55:12 +02:00
diminator
ab97fa420c loan request with moment 
shortlist on accordeonlist OK
 2015-08-26 15:46:27 +02:00
diminator
bcd6400a78 bug fix promises and notifications 2015-08-26 14:50:16 +02:00
diminator
e3b85bf808 removed loadPieceList from shortlist in detail 2015-08-26 12:51:25 +02:00
diminator
ad7e86108e prize piece serializer with DB rating stats 2015-08-26 12:33:06 +02:00
diminator
b2fed6426f loan request up till accept 2015-08-26 09:50:38 +02:00