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
|
8bb971d9df
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/cyland/cyland_landing.js
|
2015-10-15 11:55: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 |
|
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
|
21c84774c8
|
Add document title for wallets
|
2015-10-13 17:29:53 +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
|
e4c7f9e071
|
Rename whitelabel component director to cyland specific prefix
|
2015-10-13 11:23:21 +02:00 |
|
Tim Daubenschütz
|
002bab8e79
|
Increase additional data file size
|
2015-10-13 10:13:53 +02:00 |
|
diminator
|
8d970a65c4
|
spinners in forms
button wide
|
2015-10-12 17:55:02 +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
|
f38ce126b7
|
Correct handleSuccess of AclButtonList
|
2015-10-12 10:37:08 +02:00 |
|
Tim Daubenschütz
|
b95906d83e
|
Fix whitelabel styling
|
2015-10-01 16:11:29 +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 |
|
diminator
|
e6a6c2c2a3
|
set collapsible default show=true
|
2015-09-25 15:33:01 +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 |
|
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
|
6c2bb041f9
|
finalize whitelabel custom fields
|
2015-09-21 15:46:24 +02:00 |
|
Tim Daubenschütz
|
652df66cb3
|
Fix some issues with smelly code
|
2015-09-21 14:22:52 +02:00 |
|
Tim Daubenschütz
|
c00e003aeb
|
refactor input textarea to use disabled instead of editable
|
2015-09-21 12:05:42 +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 |
|
diminator
|
ff163df61e
|
PR update
|
2015-09-17 14:20:46 +02:00 |
|
diminator
|
63fffc2132
|
PR comments fix
|
2015-09-17 11:39:55 +02:00 |
|
Tim Daubenschütz
|
67e0b34640
|
integrate filtering into IkonoTv and Cyland whitelabel
|
2015-09-17 10:06:47 +02:00 |
|
diminator
|
b24d4608dd
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
|
2015-09-16 15:59:07 +02:00 |
|
Tim Daubenschütz
|
497a330e1a
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
|
2015-09-15 13:56:31 +02:00 |
|
diminator
|
b29bf38f13
|
ikono slides
|
2015-09-15 13:15:29 +02:00 |
|
diminator
|
9085a2bafe
|
cyland loanform
|
2015-09-15 09:12:30 +02:00 |
|
Tim Daubenschütz
|
73c2a7c544
|
rename fineuploader's submitKey method to submitFile
|
2015-09-14 14:46:03 +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 |
|
Tim Daubenschütz
|
b4abe7a245
|
generic form submission determination for fineuploader
|
2015-09-01 14:42:09 +02:00 |
|
Tim Daubenschütz
|
ddfc8b9621
|
minor fixes
|
2015-08-28 14:27:02 +02:00 |
|
diminator
|
5fcee39ed3
|
shortlisting enabled up till loan request
|
2015-08-25 15:19:10 +02:00 |
|
diminator
|
a07b4cc35c
|
reset cyland register form
"no votes yet" for judge
|
2015-08-25 11:11:22 +02:00 |
|
diminator
|
2d10887e1b
|
reset cyland additional data form
|
2015-08-25 10:49:49 +02:00 |
|
diminator
|
15bcd4ba14
|
average rating
cyland bug fix
|
2015-08-25 10:47:38 +02:00 |
|
Tim Daubenschütz
|
18634ffe50
|
fix additional files button bug
|
2015-08-24 14:16:13 +02:00 |
|
diminator
|
440dcd9785
|
Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page
|
2015-08-24 11:36:30 +02:00 |
|
diminator
|
54ec829588
|
notes in cyland
|
2015-08-24 11:35:35 +02:00 |
|
Tim Daubenschütz
|
d05662b879
|
fix PR issues
|
2015-08-24 11:22:44 +02:00 |
|
Tim Daubenschütz
|
116cb9c2fc
|
fix disappearing fineuploader in additional data
|
2015-08-21 14:07:10 +02:00 |
|
Tim Daubenschütz
|
5acce27df2
|
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
|
2015-08-21 11:35:00 +02:00 |
|
Tim Daubenschütz
|
09c0451c86
|
Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
|
2015-08-21 11:34:47 +02:00 |
|
Tim Daubenschütz
|
3b46dbb9f5
|
add upload busy function to fineuploader
|
2015-08-21 11:11:31 +02:00 |
|
Tim Daubenschütz
|
30d57a943f
|
fix lock form
|
2015-08-21 11:01:13 +02:00 |
|
diminator
|
433703a470
|
moved terms
|
2015-08-21 10:54:57 +02:00 |
|
diminator
|
5c6b753acb
|
piece loan history
|
2015-08-20 15:50:30 +02:00 |
|
diminator
|
60db83c626
|
cyland detail subheader
|
2015-08-20 14:18:01 +02:00 |
|
diminator
|
7afb3d68b8
|
Merge remote-tracking branch 'remotes/origin/AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
|
2015-08-20 11:32:27 +02:00 |
|
diminator
|
1f1a8b7761
|
bug fix piece loan acl
bug fix piece edit acl
DOUBLE MIGRATE
|
2015-08-19 19:12:30 +02:00 |
|
Tim Daubenschütz
|
689796b115
|
slidecontainer: display lock on progress
|
2015-08-19 18:23:04 +02:00 |
|
Tim Daubenschütz
|
495f5600af
|
implement form locking for cyland
|
2015-08-19 17:39:25 +02:00 |
|
diminator
|
b66fdc332d
|
Merge branch 'tmp2' into AD-613-cyland-white-label-page
|
2015-08-19 16:46:07 +02:00 |
|
Tim Daubenschütz
|
d5e8181855
|
make cyland submission stateful
|
2015-08-19 16:02:10 +02:00 |
|
Tim Daubenschütz
|
0b4b3fa727
|
fix slideContainer broken functionality
|
2015-08-19 15:54:13 +02:00 |
|
Tim Daubenschütz
|
8a88f978c6
|
add start_from parameter to slide container
|
2015-08-19 15:30:48 +02:00 |
|
diminator
|
b1703b6284
|
cyland landing
|
2015-08-19 14:48:22 +02:00 |
|
Tim Daubenschütz
|
406cee5bd3
|
refactor breadcrumbs to attributes
|
2015-08-19 14:11:03 +02:00 |
|
Tim Daubenschütz
|
6dab66ec61
|
restructure cyland submit button
|
2015-08-19 13:56:43 +02:00 |
|
diminator
|
b7e81fb0dd
|
cyland landing
|
2015-08-19 13:54:45 +02:00 |
|
Tim Daubenschütz
|
e88612704f
|
cyland loan form for accordion list
|
2015-08-18 13:39:06 +02:00 |
|
Tim Daubenschütz
|
ad8be7e34a
|
separate pre-sending form submission functionality
|
2015-08-18 13:15:22 +02:00 |
|
Tim Daubenschütz
|
eb54e6fff6
|
refresh piece list after loan
|
2015-08-18 10:53:50 +02:00 |
|
diminator
|
f77f1d1d5d
|
cyland submit button and form WIP
cyland footers
|
2015-08-18 09:42:28 +02:00 |
|
diminator
|
fc82c866fb
|
cyland refactor
whitelabel + cyland app
|
2015-08-17 20:52:36 +02:00 |
|
diminator
|
0be3e249bb
|
breadcrumb style fix
|
2015-08-17 13:46:04 +02:00 |
|
diminator
|
cf86e352e4
|
slide breadcrumbs
|
2015-08-17 12:18:40 +02:00 |
|
Tim Daubenschütz
|
0cf5815f42
|
add functionality to make a forwarded process slide container
|
2015-08-12 16:11:15 +02:00 |
|
Tim Daubenschütz
|
d3bf990ca5
|
adjust props
|
2015-08-12 14:40:44 +02:00 |
|
Tim Daubenschütz
|
1620437c86
|
add defaultValue to inputdate
|
2015-08-12 13:53:17 +02:00 |
|
Tim Daubenschütz
|
d5dc164810
|
boilerplate for loan process
|
2015-08-12 13:34:41 +02:00 |
|
Tim Daubenschütz
|
9630d043db
|
first slide cyland archive submission
|
2015-08-12 09:52:51 +02:00 |
|
Tim Daubenschütz
|
ac45283968
|
first iteration: whitelabel pages depending on customer
|
2015-08-11 17:40:26 +02:00 |
|