ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,584 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
Brett Sun 8f12e12bcc Move header_notification to be in sync with its component's name 2016-03-10 13:43:07 +01:00
Brett Sun 30911b5395 Make notification fetching dependent on if the current user is available 2016-03-10 13:41:36 +01:00
Tim Daubenschütz 6301c0fe46 Refactor to route specific footer 2016-03-07 13:45:40 +01:00
Brett Sun 8ba9eb20b6 Add better PropType validation for components 2016-02-05 11:53:33 +01:00
Brett Sun 826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Brett Sun d4064ee83a Change Header and parents for loading UserStore from top level app 2016-01-11 18:41:07 +01:00
Brett Sun 19841ce6c4 Refactor EventActions and UserStore to more cleanly handle user authentication and log out events 2016-01-08 14:59:45 +01:00
Brett Sun eda479a51c Change header to be just logo in print 2015-12-23 09:36:08 +01:00
Brett Sun 5aaf02b0b4 Fire profileDidLoad event in PR to load intercom 2015-12-14 16:30:38 +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
Tim Daubenschütz 32bc4b0c69 Add custom styling for PR 2015-12-08 16:43:45 +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 b8c58aa900 Add hotfix: do not unlisten history.js object 2015-12-07 17:41:10 +01:00
Brett Sun 5137fa01a9 Add note for navBar state hack 2015-11-27 14:13:30 +01:00
Tim Daubenschütz 5423f5dcd7 Bug fix for collapsing nav 2015-11-25 11:16:09 +01:00
Tim Daubenschütz 66b86209bf Add appropriate spaces to import statement in header.js 2015-10-28 17:55:44 +01:00
Tim Daubenschütz ee4c8f624e Move code from head_setter.js to dom_utils.js and adjust function-comments 2015-10-28 17:45:28 +01:00
Brett Sun 7e438dcaf5 Add link to /collection to ascribe branding on navbar 2015-10-27 11:44:40 +01:00
Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-22 13:38:49 +02:00
Tim Daubenschütz 68b608763a Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow 
Conflicts:
	js/components/header.js
	js/utils/head_setter.js
 2015-10-22 12:00:59 +02:00
Tim Daubenschütz 8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	package.json
 2015-10-20 18:11:41 +02:00
Tim Daubenschütz f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
 2015-10-19 10:30:14 +02:00
Tim Daubenschütz 2b00bfeb4f Revert "Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity" 
Remove AD-756 from PR

This reverts commit 097e158e50, reversing
changes made to 6175775503.

Conflicts:
	js/components/header.js
 2015-10-14 17:41:44 +02:00
Cevo 602675ccb4 set title pull req comment handled 2015-10-14 17:29:14 +02:00
diminator a457439347 sluice styling 2015-10-14 12:12:06 +02:00
diminator 0a07106ae8 ikonotv styling 2015-10-13 13:32:48 +02:00
diminator 24011b773b merge header - form error 2015-10-13 11:39:42 +02:00
diminator 097e158e50 Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/header.js
 2015-10-13 11:39:20 +02:00
Cevo 3597b5a905 console logs a removed head checking and default in the case of undefined head added 2015-10-08 15:39:09 +02:00
Cevo b3a9bc2594 new favicons added 2015-10-08 14:42:56 +02:00
Cevo 15460ebc2a some more cleaning 2015-10-08 12:04:40 +02:00
diminator 71988d502d ascribe fonts 
first cut layout

spinner
 2015-10-08 11:12:15 +02:00
Cevo f5a37ab4a9 browser title added, setTitle method added to head_setter module in utils 2015-10-07 15:47:54 +02:00
Cevo ae2578a57c construct header method added to utils 2015-10-06 17:19:47 +02:00
Cevo c69767c10b real logo of ikono added , backend settings changed we get everything from whitelabel logo 2015-10-05 17:21:51 +02:00
Cevo d66d80e229 real logo of ikono added 2015-10-05 14:02:02 +02:00
Cevo 526bed6029 favicons working, ikonotv has to be modified to original ikonotv 2015-10-05 11:32:57 +02:00
Cevo f033a878d0 started using favicon setter package browser icons there, ikono icon will change 2015-10-05 11:09:45 +02:00
Cevo 244c59d8e5 trying favico.js package 2015-10-05 10:16:48 +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
Cevo 23f10d4d7f qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh 2015-09-30 10:53:16 +02:00
diminator 08c3bfe7fb acl for powered_by 2015-09-29 16:48:46 +02:00
Cevo 7b9424ca68 merging from master and resolving the conflicts in main.scss, master overrides 2015-09-29 11:59:18 +02:00
Cevo 4ae73871d3 initial push for version controlling, will be edited 2015-09-24 16:06:53 +02:00
Tim Daubenschütz 74e7c9a3d9 Integrate new ACLOptions into settings 2015-09-23 15:41:12 +02:00
Tim Daubenschütz 2a4bc2af89 separate contract settings from account settings 2015-09-23 15:16:46 +02:00
diminator 1106cebf98 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-885-convert-roles-to-acls 2015-09-10 18:10:06 +02:00
Tim Daubenschütz cb6c4aaf0e integrate acl into navrouteslist + little refactor on those components 2015-09-08 14:20:06 +02:00
diminator edcd8e57a4 notification app 
notification refactor in onion - split by piece/edition
 2015-09-03 14:15:00 +02:00