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 |
|
Tim Daubenschütz
|
e53a45822b
|
simplified error handling in progress routine
|
2015-07-24 16:29:57 +02:00 |
|
Tim Daubenschütz
|
a7a36589a7
|
Add abort hashing functionality
|
2015-07-24 16:17:27 +02:00 |
|
Tim Daubenschütz
|
494ab209ca
|
implement hashing progress functionality
|
2015-07-24 14:39:04 +02:00 |
|
Tim Daubenschütz
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +02:00 |
|
Tim Daubenschütz
|
01b34ec1fb
|
add getLangText for reactfineuploader
|
2015-07-23 17:17:48 +02:00 |
|
Tim Daubenschütz
|
2f24ad8352
|
implement feedback for hashing functionalitxy
|
2015-07-23 17:05:52 +02:00 |
|
Tim Daubenschütz
|
4ec8f6b718
|
add file hashing functionality to react fine uploader
|
2015-07-23 16:47:32 +02:00 |
|
Tim Daubenschütz
|
80861813e9
|
documente and implement routine in react fine uploader
|
2015-07-23 15:57:25 +02:00 |
|
Tim Daubenschütz
|
33a179cfe2
|
converte computeHashOfFile to a promise based solution
|
2015-07-23 15:38:52 +02:00 |
|
diminator
|
0cc48a73e4
|
moved hashing to file_utils
|
2015-07-23 13:03:30 +02:00 |
|
Tim Daubenschütz
|
55f00ea0ab
|
also handle error.detail
|
2015-07-17 18:10:11 +02:00 |
|
Tim Daubenschütz
|
55058b8b34
|
fix form error handling
|
2015-07-17 16:44:24 +02:00 |
|
Tim Daubenschütz
|
263a7b2676
|
fix error throwing in requests
|
2015-07-17 16:23:25 +02:00 |
|
Tim Daubenschütz
|
f215026f8b
|
better error messages for API failures
|
2015-07-17 16:12:24 +02:00 |
|
Tim Daubenschütz
|
2ff47ede89
|
replace console logs with global logging
|
2015-07-17 15:52:53 +02:00 |
|
Tim Daubenschütz
|
af42bb8e67
|
error handling first cut
|
2015-07-17 15:41:09 +02:00 |
|
Tim Daubenschütz
|
13e151e83b
|
add logging and responsive user navigation
|
2015-07-16 19:12:18 +02:00 |
|
Tim Daubenschütz
|
343ebcf741
|
warning instead of exception
|
2015-07-16 18:30:43 +02:00 |
|
Tim Daubenschütz
|
1d50fa36a2
|
new fix
|
2015-07-16 18:27:34 +02:00 |
|
Tim Daubenschütz
|
1b210bd10c
|
fix extraction
|
2015-07-16 18:23:44 +02:00 |
|
Tim Daubenschütz
|
ee6d2789ed
|
set csrftokens as constants
|
2015-07-16 18:17:45 +02:00 |
|
Tim Daubenschütz
|
f12d2273d5
|
fix csrftoken cookie issue
|
2015-07-16 17:04:37 +02:00 |
|
Tim Daubenschütz
|
39ec4c5b91
|
fix wrong feedback for deleting an edition
|
2015-07-16 11:50:52 +02:00 |
|
diminator
|
5f7b7db00f
|
Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
Conflicts:
bitcoin/models.py
web/settings_env/live.py
|
2015-07-15 15:54:37 +02:00 |
|
vrde
|
344fffad91
|
Add language support
|
2015-07-15 14:52:14 +02:00 |
|
vrde
|
c5fd8aa28f
|
Add custom url mapping
|
2015-07-14 21:15:10 +02:00 |
|
Tim Daubenschütz
|
5ef63fbba3
|
use local whitelabel constants for route switching
|
2015-07-14 17:12:32 +02:00 |
|
Tim Daubenschütz
|
5a0663ea14
|
unshare and delete functionality + store updates for all views
|
2015-07-14 16:29:01 +02:00 |
|
Tim Daubenschütz
|
e13649383a
|
add filter function for acl actions
|
2015-07-14 13:34:32 +02:00 |
|
diminator
|
9a7bf46675
|
acl WIP
|
2015-07-13 23:57:16 +02:00 |
|
Tim Daubenschütz
|
60600a72d4
|
refactor bulk acls for backend adjustment
|
2015-07-13 21:19:45 +02:00 |
|
diminator
|
62289be5ce
|
polling for editions
|
2015-07-10 18:51:35 +02:00 |
|
Tim Daubenschütz
|
5e14ea6f87
|
refactor globalnotification
|
2015-07-08 15:40:32 +02:00 |
|
Sylvain Bellemare
|
f066008ce9
|
translated english text to french
|
2015-07-08 09:57:50 +02:00 |
|
diminator
|
fa2ae7cba8
|
styling changes for frontend
|
2015-07-07 10:28:39 +02:00 |
|
diminator
|
fbba3f4670
|
staging with cors without uglify and lang error
|
2015-07-02 18:54:47 +02:00 |
|
diminator
|
18f3b51153
|
fineuploader session with cors
|
2015-07-02 11:54:33 +02:00 |
|
Tim Daubenschütz
|
740f506ced
|
fix bug in mergeOptions method
|
2015-07-01 16:19:02 +02:00 |
|
Tim Daubenschütz
|
929c694ad7
|
finalized delete functionality
|
2015-06-30 17:57:20 +02:00 |
|
Tim Daubenschütz
|
e6ac475ad5
|
add download functionality to s3 fine uploader
|
2015-06-30 16:15:50 +02:00 |
|
Tim Daubenschütz
|
9ce6c45690
|
add sessions for already uploaded files and implement manual deletion
|
2015-06-30 15:41:39 +02:00 |
|
ddejongh
|
23190f6c48
|
signup/login
|
2015-06-20 16:43:18 +02:00 |
|
vrde
|
bd2be63341
|
Fix empty X-CSRFToken bug
|
2015-06-16 19:28:21 +02:00 |
|
ddejongh
|
1ecd579718
|
Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not
Conflicts:
js/utils/requests.js
|
2015-06-16 14:06:35 +02:00 |
|
ddejongh
|
8d73e4a77b
|
edit acl
editionnote
|
2015-06-16 14:01:53 +02:00 |
|
vrde
|
03f09b8c83
|
Rename fetch to requests to avoid name clashing
|
2015-06-16 13:48:48 +02:00 |
|
vrde
|
ed3adf8f67
|
Rename fetch to requests to avoid name clashing
|
2015-06-16 13:48:33 +02:00 |
|
ddejongh
|
bf0a2aeefb
|
consign unconsign requests
async emails
|
2015-06-11 15:03:55 +02:00 |
|
ddejongh
|
af71196dfd
|
delete function for multi editions
|
2015-06-10 15:49:46 +02:00 |
|
ddejongh
|
9241d3e38f
|
further details functional / unstyled
|
2015-06-09 17:24:06 +02:00 |
|
Tim Daubenschütz
|
6d337890d0
|
merge conflict
|
2015-06-08 13:47:24 +02:00 |
|
Tim Daubenschütz
|
e2ab0c1a5c
|
format stuff
|
2015-06-08 11:50:40 +02:00 |
|
Tim Daubenschütz
|
793e1a78ca
|
add tests for generalutils
|
2015-06-08 11:19:18 +02:00 |
|
Tim Daubenschütz
|
b1973d3a64
|
finish integrating jest testing suite
|
2015-06-08 09:53:14 +02:00 |
|
Tim Daubenschütz
|
82bea4c241
|
integrate jest - not working yet though
|
2015-06-05 16:57:56 +02:00 |
|
Tim Daubenschütz
|
f987bce7cc
|
add es6lint to build process and fix most (not really) errors and warnings
|
2015-06-05 11:06:36 +02:00 |
|
Tim Daubenschütz
|
6da18e9a85
|
rename mergeOptions
|
2015-06-04 15:38:15 +02:00 |
|
Tim Daubenschütz
|
1230ae7192
|
add handle success functionality to piece list and implement onject merger for components with multiple stores
|
2015-06-04 15:30:21 +02:00 |
|
Tim Daubenschütz
|
e3c3afcefa
|
add year to accordion-list-item
|
2015-06-03 16:34:32 +02:00 |
|
Tim Daubenschütz
|
95c199bed6
|
resolve cluster-merge-fuck
|
2015-06-02 17:32:38 +02:00 |
|
ddejongh
|
97338f2727
|
multiloan
|
2015-06-02 16:47:25 +02:00 |
|
Tim Daubenschütz
|
ff5355f0ee
|
better error messages
|
2015-06-02 14:43:42 +02:00 |
|
Tim Daubenschütz
|
0a45f12ba7
|
Merge remote-tracking branch 'origin/master' into AD-350-integrate-localization
|
2015-06-02 14:34:08 +02:00 |
|
Tim Daubenschütz
|
b5c434aa18
|
documentation
|
2015-06-02 14:33:30 +02:00 |
|
vrde
|
842575a3cd
|
Fix fetch
|
2015-06-02 14:33:00 +02:00 |
|
Tim Daubenschütz
|
fd0b3c0ead
|
minor stuff
|
2015-06-02 14:29:06 +02:00 |
|
Tim Daubenschütz
|
3183dae054
|
add german language file and integrated translation method
|
2015-06-02 14:25:26 +02:00 |
|
Tim Daubenschütz
|
347517a0b3
|
refactor all util functions for nicer usability
|
2015-06-02 13:48:01 +02:00 |
|
Tim Daubenschütz
|
366fcbf4f3
|
refactor general utils
|
2015-06-02 13:42:17 +02:00 |
|
Tim Daubenschütz
|
68be98c3f0
|
integrate string formating functionality
|
2015-06-02 13:31:12 +02:00 |
|
Tim Daubenschütz
|
a19ea989ef
|
Merge branch 'master' into AD-350-integrate-localization
|
2015-06-02 13:10:12 +02:00 |
|
Tim Daubenschütz
|
777857b50c
|
include lodash.templates
|
2015-06-02 12:00:59 +02:00 |
|
Tim Daubenschütz
|
f2d9f3b115
|
start implementing localization functionality
|
2015-06-01 18:20:15 +02:00 |
|
vrde
|
4ee4530029
|
Refactor fetch
|
2015-06-01 17:43:38 +02:00 |
|
vrde
|
096739e225
|
Update post to work with new code
|
2015-06-01 16:45:12 +02:00 |
|
vrde
|
68827466ca
|
Remove useless code
|
2015-06-01 15:37:02 +02:00 |
|
vrde
|
f50d28be98
|
Refactor fetch, WIP
|
2015-06-01 14:22:04 +02:00 |
|
ddejongh
|
3c3504d773
|
modal error
|
2015-05-27 17:33:15 +02:00 |
|
ddejongh
|
f564e909f7
|
piece_detail thumb + header
|
2015-05-26 13:33:35 +02:00 |
|
vrde
|
0a2895e0d6
|
Pagination works, it still needs some love
|
2015-05-21 17:54:27 +02:00 |
|
Tim Daubenschütz
|
9506cf3b1b
|
implement ordering
|
2015-05-21 12:12:25 +02:00 |
|
vrde
|
8ee9bda37b
|
Fix spacing
|
2015-05-20 16:44:45 +02:00 |
|
Tim Daubenschütz
|
37641650eb
|
Add dynamical rowWidth functionailty to table
|
2015-05-20 16:10:02 +02:00 |
|
Tim Daubenschütz
|
923db02f78
|
Add generic table
|
2015-05-20 14:48:57 +02:00 |
|
Tim Daubenschütz
|
47246a9083
|
create artwork component
|
2015-05-19 17:01:28 +02:00 |
|
Tim Daubenschütz
|
9c58fa321c
|
add encoding and camel to snake case conversion to FetchApiUtils
|
2015-05-19 14:09:10 +02:00 |
|
Tim Daubenschütz
|
adb4c72253
|
Remove superagent, add isomorphic fetch instead again, add constants as well as utility functions
|
2015-05-19 13:45:19 +02:00 |
|