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
TimDaubenschuetz
d66c201a98
Merged in AD-727-missing-redirects-to-login-page (pull request #95 )
...
Ad 727 missing redirects to login page
2015-10-19 10:13:54 +02:00
Cevo
0b716cfa19
warn added
2015-10-16 11:30:45 +02:00
Tim Daubenschütz
d77bdb25a5
Cleanup code
2015-10-15 11:17:16 +02:00
Tim Daubenschütz
a1f159fc2d
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
...
Conflicts:
js/components/ascribe_detail/edition.js
js/utils/general_utils.js
sass/main.scss
2015-10-15 10:06:39 +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
Tim Daubenschütz
8b23a9c74f
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
2015-10-14 17:19:01 +02:00
diminator
317d2611ba
spinners part2
...
scrollbar
uploader styles
property blur
2015-10-14 16:17:10 +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
66dbf3da71
Add document title management for the ascribe app
2015-10-13 16:42:40 +02:00
Tim Daubenschütz
984761a386
Remove stopPropagation for event in FileDragAndDrop
2015-10-13 16:12:05 +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
diminator
6175775503
property blur refactor
2015-10-12 17:59:45 +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
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
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
Cevo
f5a37ab4a9
browser title added, setTitle method added to head_setter module in utils
2015-10-07 15:47:54 +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
Tim Daubenschütz
dc6d9160fe
Fix error in AppGateway logic
2015-10-01 16:59:44 +02:00
Tim Daubenschütz
aa908a1c57
PR Feedback: Simplify subdomain extraction
2015-09-30 11:09:04 +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
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
Tim Daubenschütz
9080c84fa9
Implement word wrap for ContractSettings
2015-09-25 11:20:12 +02:00
diminator
1c5b0c7172
only one agreement pending
...
agreement notifications per subdomain (only by whitelabel owner)
2015-09-09 19:29:58 +02:00
diminator
ec2ae39e15
contractagreement with PUT instead of PATCH
2015-09-09 13:53:03 +02:00
Cevo
3e1b362cc0
remove debugged 204 no response comes as error, handled gracefully
2015-09-08 13:08:49 +02:00
Cevo
5b0cbc92ad
create refresh added, conflicts resolved
2015-09-08 11:57:20 +02:00
Cevo
a8fce698a6
createcontract refresh added
2015-09-08 11:53:09 +02:00
Tim Daubenschütz
ba2ebe81fd
code restructuring
2015-09-08 11:44:05 +02:00
Cevo
86306fc089
console.log remove from requests.js
2015-09-07 16:36:31 +02:00
Tim Daubenschütz
8a75e94413
fix bug
2015-09-04 16:24:29 +02:00
Cevo
d2f8b658af
contract listing being done
2015-09-03 15:53:02 +02:00
Tim Daubenschütz
b67466d196
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-08-27 14:05:21 +02:00
diminator
b2fed6426f
loan request up till accept
2015-08-26 09:50:38 +02:00
Tim Daubenschütz
cd49a9c402
Create generic links in nav using routes
2015-08-25 16:33:26 +02:00
diminator
411b7cb010
increase otherdata limit to 50MB
2015-08-24 12:11:07 +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
8ff2dea4df
refactor: acl buttons message functionality
2015-08-10 15:57:20 +02:00
Tim Daubenschütz
dbd0e14a64
add DELETE http support to form
2015-08-06 10:09:25 +02:00
vrde
ef61470b5f
First iteration
2015-07-29 18:00:49 +02:00
diminator
3142e00ea5
Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do
2015-07-28 12:13:40 +02:00
vrde
4d93e076df
Add third party modules to handle tracking without polluting the code
2015-07-27 18:06:02 +02:00