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
|
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 |
|
Tim Daubenschütz
|
8b23a9c74f
|
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
|
2015-10-14 17:19:01 +02:00 |
|
diminator
|
b54beae322
|
cyland
cc
|
2015-10-14 17:13:16 +02:00 |
|
Tim Daubenschütz
|
1b21bc49ab
|
Put CopyrightAssociationForm in AclProxy
|
2015-10-14 16:56:16 +02:00 |
|
Tim Daubenschütz
|
713eea03cc
|
Better robustness for slides container and register form for cyland
|
2015-10-14 16:20:51 +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 |
|
Tim Daubenschütz
|
dab7503601
|
Refactor SlidesContainer to only use queryParams to keep slidepage state
|
2015-10-14 14:22:53 +02:00 |
|
Cevo
|
a0ab076943
|
acl information render refactored
|
2015-10-14 13:30:51 +02:00 |
|
Cevo
|
f0761ec36b
|
acl information render refactored
|
2015-10-14 12:16:49 +02:00 |
|
diminator
|
a457439347
|
sluice styling
|
2015-10-14 12:12:06 +02:00 |
|
Cevo
|
2d87533009
|
prop types added
|
2015-10-14 11:41:16 +02:00 |
|
Cevo
|
b4b05b3161
|
information added to forms and delete form title changed, acl information component created, information text is added to the constants
|
2015-10-13 18:33:08 +02:00 |
|
vrde
|
2967a29f2e
|
Set title to edition/piece containers
|
2015-10-13 17:52:45 +02:00 |
|
Tim Daubenschütz
|
3321379a8f
|
bug fix for going to a piece when in a search
|
2015-10-13 17:30:49 +02:00 |
|
vrde
|
21c84774c8
|
Add document title for wallets
|
2015-10-13 17:29:53 +02:00 |
|
Tim Daubenschütz
|
ea40181805
|
add 'clear search' dialog to AccordionList and implement functionality in SearchBar
|
2015-10-13 17:28:10 +02:00 |
|
vrde
|
84d2dd7701
|
Add document title for prize
|
2015-10-13 17:02:03 +02:00 |
|
vrde
|
66dbf3da71
|
Add document title management for the ascribe app
|
2015-10-13 16:42:40 +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 |
|
Tim Daubenschütz
|
984761a386
|
Remove stopPropagation for event in FileDragAndDrop
|
2015-10-13 16:12:05 +02:00 |
|
vrde
|
d6b7060f39
|
Unify code to single quotes
|
2015-10-13 15:29:41 +02:00 |
|
vrde
|
d8e2d0e216
|
Remove useless vars and imports
|
2015-10-13 15:21:29 +02:00 |
|
vrde
|
7c231a4c5e
|
Restore baseUrl in router
|
2015-10-13 14:19:08 +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 |
|
vrde
|
dc97517d65
|
Refactor AuthProxyHandler
|
2015-10-12 17:57:23 +02:00 |
|
diminator
|
8d970a65c4
|
spinners in forms
button wide
|
2015-10-12 17:55:02 +02:00 |
|
Tim Daubenschütz
|
f57125184d
|
Merge remote-tracking branch 'origin/master' into AD-744-search-filter-not-working-i-type-
|
2015-10-12 17:35:48 +02:00 |
|
Tim Daubenschütz
|
c48c7dc4bd
|
Simplify SearchBar timing functionality
|
2015-10-12 17:33:07 +02:00 |
|
Tim Daubenschütz
|
cc089fe92b
|
Add parenthesis
|
2015-10-12 17:12:10 +02:00 |
|
Tim Daubenschütz
|
6d36be5311
|
Add documentation for SearchBar and put threshold into AppConstants
|
2015-10-12 17:10:04 +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
|
c59f5267ce
|
add threshold functionality to SearchBar
|
2015-10-12 16:38:00 +02:00 |
|
diminator
|
aaa1a9a000
|
replaced fonts
replaced spinners WIP
renamed settings-property to property
|
2015-10-12 15:25:21 +02:00 |
|
Tim Daubenschütz
|
356e0e368a
|
Fix some spelling errors in documentation
|
2015-10-12 14:29:31 +02:00 |
|
Tim Daubenschütz
|
a7683a44be
|
fix wrong redirect in header_notification
|
2015-10-12 14:24:21 +02:00 |
|
Tim Daubenschütz
|
d760fe13d0
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
|
2015-10-12 14:18:53 +02:00 |
|
Tim Daubenschütz
|
02eafaa80c
|
Isolate SearchBar from PieceListToolbar and start implement threshold logic
|
2015-10-12 13:57:37 +02:00 |
|
diminator
|
c7122d9435
|
plus submit button on piecelist
|
2015-10-12 12:08:53 +02:00 |
|
Tim Daubenschütz
|
1c48b8b828
|
Merge branch 'master' into AD-744-search-filter-not-working-i-type-
|
2015-10-12 11:06:47 +02:00 |
|
Tim Daubenschütz
|
f38ce126b7
|
Correct handleSuccess of AclButtonList
|
2015-10-12 10:37:08 +02:00 |
|
Tim Daubenschütz
|
6c34cb0377
|
Add last bit of documentation
|
2015-10-12 09:24:18 +02:00 |
|
diminator
|
790bf595d9
|
glyphs, spinner, piece list/edition table
|
2015-10-09 16:21:26 +02:00 |
|
Tim Daubenschütz
|
d86668e759
|
Document RedirectProxyHandler
|
2015-10-09 15:51:03 +02:00 |
|
Tim Daubenschütz
|
211e253fb8
|
Add documentation for ProxyRoute
|
2015-10-09 15:39:00 +02:00 |
|
Tim Daubenschütz
|
69afc6165a
|
Incorporate new RedirectProxyRoute into whitelabel pages
|
2015-10-09 15:19:24 +02:00 |
|
Cevo
|
434d852666
|
bug in the collection list handled
|
2015-10-09 14:38:18 +02:00 |
|
Cevo
|
b8f7527a0b
|
console.logs removed
|
2015-10-09 14:32:45 +02:00 |
|
Cevo
|
6fd8152d22
|
instrange badge removed, eslint gives an error for a necessary line of code so not modified, tested
|
2015-10-09 14:30:22 +02:00 |
|
Tim Daubenschütz
|
cee8d7cae7
|
fix bug in FileDragAndDropDialog
|
2015-10-09 14:22:48 +02:00 |
|
Cevo
|
03680bd830
|
information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them)
|
2015-10-09 14:19:43 +02:00 |
|
Tim Daubenschütz
|
299007baab
|
Refactor redirect and redirectAuthenticated
|
2015-10-09 13:51:21 +02:00 |
|
diminator
|
dc8599830b
|
updated glyphs, accordion pieces ok
|
2015-10-09 13:14:29 +02:00 |
|
Tim Daubenschütz
|
5e2240dbd3
|
remove TransactionManager boilerplate code again
|
2015-10-09 11:20:22 +02:00 |
|
Cevo
|
d1471d1ec9
|
new logo
|
2015-10-09 11:13:28 +02:00 |
|
Cevo
|
38247fe15f
|
iod attribute added to favicons
|
2015-10-09 10:14:59 +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
|
f2d02179a1
|
pullrequest changes
|
2015-10-08 13:19:59 +02:00 |
|
Cevo
|
15460ebc2a
|
some more cleaning
|
2015-10-08 12:04:40 +02:00 |
|
Cevo
|
8b13a21f9c
|
put lets instead of vars
|
2015-10-08 11:28:41 +02:00 |
|
Cevo
|
34d4b0ccb9
|
try catch put in for loop it is just for checking and logging errors, the program should go on even wrong cinfig type comes from the backend(worng config type will be skipped)
|
2015-10-08 11:25:14 +02:00 |
|
diminator
|
71988d502d
|
ascribe fonts
first cut layout
spinner
|
2015-10-08 11:12:15 +02:00 |
|
Cevo
|
087884ef3c
|
sharare button moved to the right
|
2015-10-08 10:14:50 +02:00 |
|
Cevo
|
924b462cc1
|
sharare button moved to the right
|
2015-10-08 10:14:06 +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
|
bb3670ef4d
|
padding and border added
|
2015-10-07 13:52:30 +02:00 |
|
Tim Daubenschütz
|
b4f9c11c16
|
Implement loggedOut routings
|
2015-10-07 09:39:30 +02:00 |
|
Tim Daubenschütz
|
471d95977e
|
Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page
|
2015-10-07 09:31:49 +02:00 |
|
Tim Daubenschütz
|
f5c06e070c
|
Separate dispatcher logic of whitelabel and user stores
|
2015-10-07 09:31:38 +02:00 |
|
Tim Daubenschütz
|
f066971ccc
|
Finalize ProxyRoute and RedirectProxyRoute
|
2015-10-06 18:28:15 +02:00 |
|
Cevo
|
ef9bbb548d
|
comments in head_setter corrected
|
2015-10-06 17:26:30 +02:00 |
|
Cevo
|
f2b277821d
|
construct header file in utils
|
2015-10-06 17:24:53 +02:00 |
|
Cevo
|
ae2578a57c
|
construct header method added to utils
|
2015-10-06 17:19:47 +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
|
28dfcfa75a
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/ascribe_detail/edition.js
js/components/ascribe_forms/form_login.js
js/components/ascribe_forms/form_signup.js
|
2015-10-06 16:40:02 +02:00 |
|
Tim Daubenschütz
|
0c6538df2f
|
add redirect to auth_component
|
2015-10-06 15:38:39 +02:00 |
|
Tim Daubenschütz
|
6877f2c8a7
|
Minor renaming of ProxyHandler
|
2015-10-06 15:29:01 +02:00 |
|
Cevo
|
70eedbabaf
|
line spacing in info text edited
|
2015-10-06 10:20:57 +02:00 |
|
Tim Daubenschütz
|
97fd639c30
|
Implement ProxyRoute
|
2015-10-06 10:20:36 +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 |
|
Tim Daubenschütz
|
c174b8b56c
|
Tighten lib-dependencies, move history into its own module
|
2015-10-05 11:52:23 +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
|
31a83a1d61
|
Add TransactionManager boilerplate code
|
2015-10-02 11:03:42 +02:00 |
|
Tim Daubenschütz
|
49f8178f38
|
Remove IndexRoute from main app
|
2015-10-02 09:48:51 +02:00 |
|
Tim Daubenschütz
|
dc6d9160fe
|
Fix error in AppGateway logic
|
2015-10-01 16:59:44 +02:00 |
|
Tim Daubenschütz
|
b95906d83e
|
Fix whitelabel styling
|
2015-10-01 16:11:29 +02:00 |
|
Tim Daubenschütz
|
9a17e44df1
|
Refactor of wallet app routing
|
2015-10-01 15:57:46 +02:00 |
|
diminator
|
5f201ad76a
|
fix redirect
|
2015-10-01 15:38:37 +02:00 |
|
Tim Daubenschütz
|
8f9b5c7f27
|
Implement new routine for routeDidChange
|
2015-10-01 15:17:55 +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
|
f9393c5bb3
|
Remove all unneccessary react-router imports
|
2015-10-01 14:36:56 +02:00 |
|
Tim Daubenschütz
|
d399027dd6
|
Fix isActive reference
|
2015-10-01 14:34:46 +02:00 |
|
Tim Daubenschütz
|
83c652a4f0
|
Rename pieces routes back to collection
|
2015-10-01 14:30:11 +02:00 |
|
Tim Daubenschütz
|
a4e00ba89e
|
Fix dynamic routing for react-router-bootstrap
|
2015-10-01 14:16:20 +02:00 |
|
Tim Daubenschütz
|
17fd470e6b
|
Upgrade react-router-bootstrap
|
2015-10-01 14:00:56 +02:00 |
|
Tim Daubenschütz
|
957d0c66c9
|
minor fixes for last commit
|
2015-10-01 11:24:19 +02:00 |
|
Tim Daubenschütz
|
829f2c592b
|
Switch all usages of Router.Navigation and Router.State
|
2015-10-01 11:16:38 +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 |
|
Tim Daubenschütz
|
8cd4377a58
|
Change links in app to new react-router@1.0rc1 syntax
|
2015-09-30 18:30:50 +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 |
|
Tim Daubenschütz
|
eebe936023
|
Change: router rendering, router location, route configs, notFound routes, redirect routes,
|
2015-09-30 17:09:46 +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 |
|
diminator
|
55f5d959ff
|
PR fixes
|
2015-09-30 11:26:31 +02:00 |
|
Tim Daubenschütz
|
7283ae7574
|
PR Feedback: Change API error handling to saver approach
|
2015-09-30 11:22:20 +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 |
|
TimDaubenschuetz
|
662b837d5d
|
Merged in AD-1071-naked-domain-is-not-requesting-t (pull request #85)
Write generic function for extracting subdomain and implement troughout whole app
|
2015-09-30 11:10:05 +02:00 |
|
Tim Daubenschütz
|
aa908a1c57
|
PR Feedback: Simplify subdomain extraction
|
2015-09-30 11:09:04 +02:00 |
|
Tim Daubenschütz
|
dc753caf87
|
Add getLangText to ErrorNotFoundPage
|
2015-09-30 11:06:42 +02:00 |
|
Cevo
|
28ab655505
|
merged again with master
|
2015-09-30 10:53:52 +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 |
|
Tim Daubenschütz
|
99d29449a3
|
style 404 page
|
2015-09-30 10:44:38 +02:00 |
|
diminator
|
4f6e39699f
|
PR getlangtext
|
2015-09-30 09:46:11 +02:00 |
|
diminator
|
ea4805caa0
|
create CoA when not found
|
2015-09-30 09:14:57 +02:00 |
|
diminator
|
cda81b6f5b
|
withdraw consign
and acl buttonlist in detail refactor
|
2015-09-29 18:09:34 +02:00 |
|
Tim Daubenschütz
|
e356570bc8
|
remove console log
|
2015-09-29 17:56:18 +02:00 |
|
diminator
|
08c3bfe7fb
|
acl for powered_by
|
2015-09-29 16:48:46 +02:00 |
|
Tim Daubenschütz
|
90cf137c2c
|
Integrate error page in app + whitelabel pages
|
2015-09-29 16:00:58 +02:00 |
|
diminator
|
f64fb73aa6
|
cc fixes in licenses, collection and details
|
2015-09-29 15:58:24 +02:00 |
|
Tim Daubenschütz
|
40095f7fbf
|
throw javascript errors on >= 400 HTTP errors
|
2015-09-29 15:38:06 +02:00 |
|
Tim Daubenschütz
|
550eb2dc0b
|
Add fetchPieceList to PieceListBulkModal
|
2015-09-29 15:23:57 +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 |
|
Tim Daubenschütz
|
a3656410b1
|
Update component no PieceListStore changes
|
2015-09-29 14:25:30 +02:00 |
|
diminator
|
ec0a458189
|
removed console log
|
2015-09-29 14:14:59 +02:00 |
|
diminator
|
33ba4ce07f
|
li instead of menuitem
|
2015-09-29 14:13:15 +02:00 |
|
diminator
|
c4fc6ab97f
|
debug console log
|
2015-09-29 13:22:24 +02:00 |
|
Cevo
|
7b9424ca68
|
merging from master and resolving the conflicts in main.scss, master overrides
|
2015-09-29 11:59:18 +02:00 |
|
Tim Daubenschütz
|
df338ac746
|
Fix alignment for AclInformationButton
|
2015-09-29 10:31:13 +02:00 |
|
Cevo
|
661cb44b94
|
reached the spec with dirty tricks
|
2015-09-28 22:09:25 +02:00 |
|
Tim Daubenschütz
|
e1ac3ca4c6
|
Add multi level ACLs for loan piece detail loan button
|
2015-09-28 17:39:58 +02:00 |
|
Tim Daubenschütz
|
52fc19444a
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-28 17:22:02 +02:00 |
|
Tim Daubenschütz
|
4be3040396
|
Instead of transition from logout to login, we replace the state
|
2015-09-28 17:21:34 +02:00 |
|
diminator
|
9bb5a51fed
|
bug fix show public note for anonymous
|
2015-09-28 17:11:15 +02:00 |
|
diminator
|
2dda22d848
|
fix: ikonotv redirect to collection if logged in
|
2015-09-28 16:57:46 +02:00 |
|
diminator
|
19f94110b7
|
fix: ikonotv redirect to collection if logged in
|
2015-09-28 16:57:35 +02:00 |
|
diminator
|
0a0a34b0e3
|
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-28 16:44:37 +02:00 |
|
Tim Daubenschütz
|
9045b9ec01
|
refresh piece list on every major acl action
|
2015-09-28 16:32:59 +02:00 |
|
diminator
|
db1ef91965
|
bug fix filterParams=null on sluice
|
2015-09-28 16:29:50 +02:00 |
|
Tim Daubenschütz
|
3ae362ac15
|
Fix queryParams glitch for slide show in register_piece
|
2015-09-28 15:59:36 +02:00 |
|
Tim Daubenschütz
|
5b9d7eae65
|
Corrections on loan form
|
2015-09-28 15:14:45 +02:00 |
|
Tim Daubenschütz
|
5b41e368ac
|
Implement AclProxy for hash work in account settings
|
2015-09-28 12:00:13 +02:00 |
|
Tim Daubenschütz
|
62e85c66ac
|
Rename 'Send loan request' to 'send contract' for ikonoTv
|
2015-09-28 11:51:02 +02:00 |
|
Tim Daubenschütz
|
afef5db150
|
Add proper button to create editions form
|
2015-09-28 10:19:12 +02:00 |
|
Tim Daubenschütz
|
2e6acff56d
|
Make user email uneditable
|
2015-09-28 10:02:07 +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
|
5ddf89e020
|
forward to collection after contract sent
|
2015-09-25 15:39:36 +02:00 |
|
diminator
|
b2cbe2c674
|
merged
|
2015-09-25 15:35:36 +02:00 |
|
diminator
|
e6a6c2c2a3
|
set collapsible default show=true
|
2015-09-25 15:33:01 +02:00 |
|
TimDaubenschuetz
|
a4975e8137
|
Merged in AD-1036-put-contracts-in-his-own-menu (pull request #79)
Ad 1036 put contracts in his own menu
|
2015-09-25 15:29:21 +02:00 |
|
Tim Daubenschütz
|
5e98787288
|
Minor renaming fix
|
2015-09-25 15:25:34 +02:00 |
|
Tim Daubenschütz
|
cb452ce7bf
|
PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex
|
2015-09-25 15:22:16 +02:00 |
|
Cevo
|
48f43ac01c
|
the real dropdown version second iteration
|
2015-09-25 14:36:27 +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
|
16e7a54b27
|
add coa_verify route to wallet_routes to avoid crash
|
2015-09-25 11:51:03 +02:00 |
|
Tim Daubenschütz
|
9080c84fa9
|
Implement word wrap for ContractSettings
|
2015-09-25 11:20:12 +02:00 |
|
Tim Daubenschütz
|
7d3c14d1cc
|
Conditional header for + NEW WORK
|
2015-09-25 10:10:27 +02:00 |
|
Tim Daubenschütz
|
81aa052a8a
|
Fix load piece method in WalletPieceContainer
|
2015-09-25 09:53:52 +02:00 |
|
Cevo
|
4ae73871d3
|
initial push for version controlling, will be edited
|
2015-09-24 16:06:53 +02:00 |
|
Tim Daubenschütz
|
a6f09c8f35
|
add acl for update button in ContractSettings
|
2015-09-23 16:09:12 +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 |
|
Tim Daubenschütz
|
4302da2f81
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-23 14:22:09 +02:00 |
|
Tim Daubenschütz
|
4acbc2c923
|
fix InputTextareaToggable
|
2015-09-23 14:12:33 +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
|
24b7031c72
|
Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields
|
2015-09-22 17:23:37 +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
|
3a11efb2fc
|
Improve input_textarea_toggleable
|
2015-09-22 17:13:06 +02:00 |
|
Tim Daubenschütz
|
52903c6982
|
Fix labels for buttons
|
2015-09-22 16:49:01 +02:00 |
|
Tim Daubenschütz
|
1320b5c965
|
cleanup form_loan and contract_agreement_list_actions
|
2015-09-22 16:45:24 +02:00 |
|
Tim Daubenschütz
|
33b8e51aee
|
Fix react warning for select inputs
|
2015-09-22 14:13:04 +02:00 |
|
Tim Daubenschütz
|
bd5aa266b1
|
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
|
2015-09-22 13:38:31 +02:00 |
|
Tim Daubenschütz
|
4bbc4afd61
|
Increase robustness by excluding meta data for pieces that have been loaned before actual launch
|
2015-09-22 13:37:31 +02:00 |
|
Tim Daubenschütz
|
878a716262
|
Remove 'learn more' from contract form
|
2015-09-22 13:20:55 +02:00 |
|
diminator
|
54a1049b48
|
Merged in AD-1029-add-filter-for-submitted-accepte (pull request #71)
filter for submitted and accepted on ikonotv
|
2015-09-22 13:14:28 +02:00 |
|
diminator
|
5f98f65842
|
filter in frontend
|
2015-09-22 12:20:14 +02:00 |
|
Tim Daubenschütz
|
a8c436c40b
|
Change detail text in loan process
|
2015-09-22 11:56:30 +02:00 |
|
Tim Daubenschütz
|
aaa27550af
|
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
|
2015-09-22 11:43:53 +02:00 |
|
Tim Daubenschütz
|
31ffc4262a
|
change text in signup form
|
2015-09-22 11:41:10 +02:00 |
|
Tim Daubenschütz
|
a0ff5af62b
|
Make style changes
|
2015-09-22 11:33:59 +02:00 |
|
Tim Daubenschütz
|
b0b44718da
|
Changes to landing page text according to Elisabeth
|
2015-09-22 10:29:23 +02:00 |
|
diminator
|
b4c7b864fd
|
check if piece exists in props in wallet details
|
2015-09-22 09:20:10 +02:00 |
|
diminator
|
904793269b
|
refactored detail page for wallets
|
2015-09-21 18:04:15 +02:00 |
|
diminator
|
c837890895
|
Merge remote-tracking branch 'remotes/origin/AD-1029-add-filter-for-submitted-accepte' into AD-943-add-custom-additional-fields
|
2015-09-21 16:51:28 +02:00 |
|
diminator
|
a4fe0417c3
|
refactored and adapted for cyland
|
2015-09-21 16:47:29 +02:00 |
|
Tim Daubenschütz
|
bd99adf4c9
|
add componentWillReceiveProps in ikono piece detail again
|
2015-09-21 16:25:28 +02:00 |
|
vrde
|
865c21557c
|
Add style for buttons
|
2015-09-21 16:23:18 +02:00 |
|
diminator
|
fdbae0316f
|
filter for submitted and accepted on ikonotv
MIGRATE AND
./manage.py loaddata whitelabel/fixtures/settings.json
|
2015-09-21 16:14:39 +02:00 |
|
Tim Daubenschütz
|
6102ed3bb4
|
update react textarea autosize
|
2015-09-21 16:10:25 +02:00 |
|
Tim Daubenschütz
|
04e331f4e5
|
hide additional files when not defined and already loaned to whitelabel customer
|
2015-09-21 15:57:27 +02:00 |
|
Tim Daubenschütz
|
6c2bb041f9
|
finalize whitelabel custom fields
|
2015-09-21 15:46:24 +02:00 |
|
Tim Daubenschütz
|
c756024702
|
Add whitelabel tailored extra_data forms to piece detail
|
2015-09-21 15:08:24 +02:00 |
|
Tim Daubenschütz
|
652df66cb3
|
Fix some issues with smelly code
|
2015-09-21 14:22:52 +02:00 |
|
Tim Daubenschütz
|
8a6674509c
|
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
|
2015-09-21 12:05:53 +02:00 |
|
Tim Daubenschütz
|
c00e003aeb
|
refactor input textarea to use disabled instead of editable
|
2015-09-21 12:05:42 +02:00 |
|
diminator
|
92f543490e
|
buttonlink style
|
2015-09-21 11:26:36 +02:00 |
|
diminator
|
a8976ca54a
|
Merge remote-tracking branch 'remotes/origin/AD-996-add-action-buttons-to-piece-detai' into AD-943-add-custom-additional-fields
|
2015-09-21 11:08:05 +02:00 |
|
Tim Daubenschütz
|
3cbcfc17a3
|
Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields
|
2015-09-21 10:57:19 +02:00 |
|
Tim Daubenschütz
|
0819724a10
|
probably fix dispatch.dispatch error + showing wrong piece data bug
|
2015-09-21 10:57:10 +02:00 |
|
diminator
|
ec0208358d
|
added appendix
|
2015-09-21 10:54:13 +02:00 |
|
diminator
|
2486158c12
|
.required => .isRequired
|
2015-09-21 10:47:24 +02:00 |
|
diminator
|
9d67d046d0
|
fix currentUser bug
|
2015-09-21 10:32:35 +02:00 |
|
diminator
|
9bfd50e3bc
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
Conflicts:
js/components/signup_container.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
|
2015-09-21 10:21:44 +02:00 |
|
Tim Daubenschütz
|
7b7250db24
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-18 16:21:03 +02:00 |
|
Tim Daubenschütz
|
afef1214f0
|
contract expandedDefault to false
|
2015-09-18 16:04:48 +02:00 |
|
Tim Daubenschütz
|
7482c3f448
|
add user endpoint to cyland
|
2015-09-18 15:51:15 +02:00 |
|
vrde
|
94568934ea
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-999-style-login-and-signup-forms
|
2015-09-18 15:43:44 +02:00 |
|
vrde
|
004aa16b3f
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-18 15:43:30 +02:00 |
|
vrde
|
2ba7eac191
|
Add "already a user" link from signup to login
|
2015-09-18 15:40:06 +02:00 |
|
vrde
|
7be3c8b469
|
Add style for signup and login
|
2015-09-18 15:36:01 +02:00 |
|
Tim Daubenschütz
|
eb43b18167
|
make remove in ContractSettings a secondary action
|
2015-09-18 15:22:57 +02:00 |
|
TimDaubenschuetz
|
26321571cb
|
Merged in AD-984-disable-contracts-for-regular-asc (pull request #64)
acl on contract settings
|
2015-09-18 15:20:08 +02:00 |
|
Tim Daubenschütz
|
63b375ade6
|
fix separation
|
2015-09-18 15:17:24 +02:00 |
|
TimDaubenschuetz
|
4f55c63cf5
|
Merged in AD-997-prepare-landing-page (pull request #67)
Finish styling for landing page
|
2015-09-18 14:54:11 +02:00 |
|
Tim Daubenschütz
|
e05249eacb
|
WIP fix wrong input fields bug
|
2015-09-18 14:50:08 +02:00 |
|
vrde
|
03803ca61a
|
Add active routes as css classes
|
2015-09-18 14:25:31 +02:00 |
|
Tim Daubenschütz
|
2cbf7d0095
|
Implement PR Feedback
|
2015-09-18 14:12:50 +02:00 |
|
vrde
|
b76ffcde73
|
Finish styling for landing page
|
2015-09-18 13:46:15 +02:00 |
|
diminator
|
c67c87f17b
|
WARNING: Based upon D-943, which hasnt been approved/merged yet
after AD-943 has been approved, merge it in this branch and do PR
actions + buttons in ikono piece detail
|
2015-09-18 10:11:35 +02:00 |
|
diminator
|
6146a5f6f4
|
Merge remote-tracking branch 'remotes/origin/AD-943-add-custom-additional-fields' into AD-996-add-action-buttons-to-piece-detai
|
2015-09-18 09:55:07 +02:00 |
|
diminator
|
7bccb26d82
|
acl on contract settings
|
2015-09-18 09:46:37 +02:00 |
|
diminator
|
2bd148407b
|
Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields
|
2015-09-17 14:22:19 +02:00 |
|
diminator
|
ff163df61e
|
PR update
|
2015-09-17 14:20:46 +02:00 |
|