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 097e158e5064fbe58e73bc561a492ec961740cfb, reversing
changes made to 617577550309d3190a85f99bbbbd364feec5af46.
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
diminator
71c438ee59
close notifications dropdown after click
2015-09-01 18:38:24 +02:00
diminator
7919521578
refactor of notifications
2015-09-01 18:11:18 +02:00
diminator
bfaf4886a4
notifications unoptimized
2015-09-01 14:45:14 +02:00
Tim Daubenschütz
02ed21fef5
fix nav links on logged out user
2015-08-28 15:31:12 +02:00
Tim Daubenschütz
9d7a9bd028
add router/navigation integration into whole project
2015-08-27 14:34:15 +02:00
Tim Daubenschütz
cd49a9c402
Create generic links in nav using routes
2015-08-25 16:33:26 +02:00
Tim Daubenschütz
0cf5815f42
add functionality to make a forwarded process slide container
2015-08-12 16:11:15 +02:00
vrde
4d93e076df
Add third party modules to handle tracking without polluting the code
2015-07-27 18:06:02 +02:00
Alberto Granzotto
658a4b3372
Merged in AD-586-implement-logging-for-whole-app (pull request #12 )
...
Ad 586 implement logging for whole app
2015-07-17 18:25:56 +02:00
Tim Daubenschütz
af42bb8e67
error handling first cut
2015-07-17 15:41:09 +02:00
