Tim Daubenschütz
|
afef5db150
|
Add proper button to create editions form
|
2015-09-28 10:19:12 +02:00 |
|
Tim Daubenschütz
|
40777cfeae
|
Center dialog text for hashing files in file_drag_and_drop
|
2015-09-28 10:07:17 +02:00 |
|
Tim Daubenschütz
|
2e6acff56d
|
Make user email uneditable
|
2015-09-28 10:02:07 +02:00 |
|
Tim Daubenschütz
|
827e734b6a
|
remove .gitignore~
|
2015-09-25 16:26:47 +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
|
7bc686e8a4
|
Merged in AD-940-spool-features-in-piece-detail-we (pull request #82)
set collapsible default show=true
|
2015-09-25 16:17:50 +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 |
|
TimDaubenschuetz
|
296680c431
|
Merged in AD-956-clicking-browser-back-button-from (pull request #81)
Ad 956 clicking browser back button from
|
2015-09-25 14:42:14 +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 |
|
Alberto Granzotto
|
a30c80e6fb
|
Merged in AD-961-fix-mobile-menu (pull request #80)
Fix mobile menu
|
2015-09-23 16:28:09 +02:00 |
|
vrde
|
6fd01b12a5
|
Fix mobile menu
|
2015-09-23 16:27:32 +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 |
|
TimDaubenschuetz
|
93e61cfff5
|
Merged in AD-943-add-custom-additional-fields (pull request #60)
Ad 943 add custom additional fields
|
2015-09-23 14:16:16 +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 |
|
TimDaubenschuetz
|
6e09d5bc16
|
Merged in AD-1049-fix-form-borders (pull request #78)
Fix form borders
|
2015-09-22 17:21:12 +02:00 |
|
Tim Daubenschütz
|
3a11efb2fc
|
Improve input_textarea_toggleable
|
2015-09-22 17:13:06 +02:00 |
|
vrde
|
172b5b7c5b
|
Fix form borders
|
2015-09-22 17:11:38 +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 |
|
TimDaubenschuetz
|
dfc75824de
|
Merged in AD-1045-revamp-flashy-landing-page (pull request #76)
Landing now iterates over colors
|
2015-09-22 15:18:19 +02:00 |
|
TimDaubenschuetz
|
30f2d75cb4
|
Merged in AD-1032-style-progress-and-notifications (pull request #74)
Add style for notification
|
2015-09-22 15:17:46 +02:00 |
|
TimDaubenschuetz
|
62e5ce4209
|
Merged in AD-1027-style-buttons (pull request #77)
Ad 1027 style buttons
|
2015-09-22 15:17:17 +02:00 |
|
vrde
|
259f4b10e3
|
Style progress bar
|
2015-09-22 15:13:48 +02:00 |
|
vrde
|
69f0753fc7
|
Fix color for "open" status for .btn-default
|
2015-09-22 15:02:36 +02:00 |
|
vrde
|
1885440447
|
Landing now iterates over colors
|
2015-09-22 14:46:32 +02:00 |
|
Tim Daubenschütz
|
33b8e51aee
|
Fix react warning for select inputs
|
2015-09-22 14:13:04 +02:00 |
|
TimDaubenschuetz
|
9cba89b16a
|
Merged in AD-1027-style-buttons (pull request #75)
Add color for disabled buttons
|
2015-09-22 14:01:45 +02:00 |
|
vrde
|
d4f637aa8a
|
Add color for disabled buttons
|
2015-09-22 13:44:19 +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 |
|
vrde
|
c7321359c9
|
Add style for notification
|
2015-09-22 13:37: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 |
|