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
diminator
c24021302f
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_hero.js
2015-10-14 17:25:53 +02:00
diminator
b54beae322
cyland
...
cc
2015-10-14 17:13:16 +02:00
diminator
317d2611ba
spinners part2
...
scrollbar
uploader styles
property blur
2015-10-14 16:17:10 +02:00
vrde
2869cbc125
Disable eslint check on specific proptype
2015-10-14 15:49:04 +02:00
vrde
01cea9ad3d
Property component now propagate its name to its input child
2015-10-14 15:30:10 +02:00
diminator
a457439347
sluice styling
2015-10-14 12:12:06 +02:00
TimDaubenschuetz
7af4e0912e
Merged in AD-972-remove-50mb-limit-in-additional-f (pull request #98 )
...
Ad 972 remove 50mb limit in additional f
2015-10-13 16:42:04 +02:00
Tim Daubenschütz
4627381c16
add getLangText
2015-10-13 16:41:35 +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
Tim Daubenschütz
2121c6af3d
Rename whitelabel component director to ikonotv specific prefix
2015-10-13 11:39:33 +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
Tim Daubenschütz
e4c7f9e071
Rename whitelabel component director to cyland specific prefix
2015-10-13 11:23:21 +02:00
Tim Daubenschütz
8ac69bab5d
Change additional files label
2015-10-13 10:20:23 +02:00
Tim Daubenschütz
002bab8e79
Increase additional data file size
2015-10-13 10:13:53 +02:00
diminator
6175775503
property blur refactor
2015-10-12 17:59:45 +02:00
diminator
8d970a65c4
spinners in forms
...
button wide
2015-10-12 17:55:02 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +02:00
diminator
c7122d9435
plus submit button on piecelist
2015-10-12 12:08:53 +02:00
Tim Daubenschütz
f38ce126b7
Correct handleSuccess of AclButtonList
2015-10-12 10:37:08 +02:00
diminator
790bf595d9
glyphs, spinner, piece list/edition table
2015-10-09 16:21:26 +02:00
diminator
dc8599830b
updated glyphs, accordion pieces ok
2015-10-09 13:14:29 +02:00
diminator
85d3184e98
piece list styling
2015-10-09 02:00:02 +02:00
diminator
b7aaa9a4cf
collection page + footer
2015-10-08 20:26:29 +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
Tim Daubenschütz
f5c06e070c
Separate dispatcher logic of whitelabel and user stores
2015-10-07 09:31:38 +02:00
Cevo
ae2578a57c
construct header method added to utils
2015-10-06 17:19:47 +02:00
Tim Daubenschütz
000719e14d
Move third party actions/stores to separate dispatcher
2015-10-06 16:47:59 +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
diminator
5f201ad76a
fix redirect
2015-10-01 15:38:37 +02:00
diminator
acd29b0cbe
Merge remote-tracking branch 'remotes/origin/master' into AD-535-when-non-member-gets-work-transfe
2015-10-01 10:26:54 +02:00
diminator
708cf1b3da
Merged in AD-806-webapp-users-cannot-withdraw-a-pe (pull request #88 )
...
withdraw consign
2015-10-01 09:49:56 +02:00
diminator
b233dbb937
PR fixes
2015-10-01 09:49:01 +02:00
diminator
dfa01a0dde
signup fix
...
consign redirect
2015-10-01 09:45:12 +02:00
TimDaubenschuetz
ccc7bf9c06
Merged in AD-992-im-on-page-3-i-deleted-an-edition (pull request #86 )
...
Ad 992 im on page 3 i deleted an edition
2015-09-30 17:48:12 +02:00
diminator
bbae33a40f
avoid dispatcherror when switching to signup
2015-09-30 17:07:18 +02:00
diminator
0d6e82a45d
WIP signup/login redirect and redirectAuthenticated
2015-09-30 17:05:40 +02:00
diminator
44cf707e34
refactoring out edition_actions
2015-09-30 12:12:14 +02:00
diminator
2aef82be0b
Merged in AD-772-coa-doesnt-render (pull request #89 )
...
create CoA when not found
2015-09-30 12:03:34 +02:00
diminator
009d12ee53
Merge remote-tracking branch 'remotes/origin/AD-772-coa-doesnt-render' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:56 +02:00
diminator
b773ac829a
Merge remote-tracking branch 'remotes/origin/master' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:37 +02:00
