Tim Daubenschütz
|
eba9023efc
|
From dom_utils.js, remove useless 'continue' statement in loop/try-catch
|
2015-10-29 13:22:10 +01:00 |
|
Tim Daubenschütz
|
ee4c8f624e
|
Move code from head_setter.js to dom_utils.js and adjust function-comments
|
2015-10-28 17:45:28 +01:00 |
|
Tim Daubenschütz
|
d4de2434ee
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
js/components/ascribe_forms/form_share_email.js
js/components/ascribe_forms/form_transfer.js
js/utils/general_utils.js
sass/main.scss
|
2015-10-22 13:38:49 +02:00 |
|
Tim Daubenschütz
|
68b608763a
|
Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow
Conflicts:
js/components/header.js
js/utils/head_setter.js
|
2015-10-22 12:00:59 +02:00 |
|
Tim Daubenschütz
|
fad6caca63
|
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
|
2015-10-21 09:47:14 +02:00 |
|
Tim Daubenschütz
|
8d0e9a42fc
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
package.json
|
2015-10-20 18:11:41 +02:00 |
|
Tim Daubenschütz
|
ddc2e7b919
|
Rename intersectAcls to intersectList and do some clean up
|
2015-10-20 18:10:48 +02:00 |
|
vrde
|
e220ee6fbb
|
Merge branch 'AD-697-update-title-in-the-browser'
|
2015-10-20 15:06:41 +02:00 |
|
vrde
|
5f0329ccf6
|
Remove useless code
|
2015-10-20 11:35:32 +02:00 |
|
vrde
|
4ee26d7259
|
Update PR with fixes
|
2015-10-20 11:25:27 +02:00 |
|
vrde
|
7ce98d0433
|
Fix comments on PR
|
2015-10-19 17:24:49 +02:00 |
|
TimDaubenschuetz
|
5a35e40a76
|
Merged in AD-947-fileuploader-button-does-not-work (pull request #100)
Remove stopPropagation for event in FileDragAndDrop
|
2015-10-19 14:53:02 +02:00 |
|
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 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 |
|
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 |
|