Tim Daubenschütz
|
77093cb23f
|
fix minor table bug
|
2015-07-01 10:54:51 +02:00 |
|
Tim Daubenschütz
|
d67bbe7770
|
made accordion table responsive
|
2015-07-01 10:53:40 +02:00 |
|
Tim Daubenschütz
|
3cd14418e7
|
fix piece list bulk modal scaling
|
2015-07-01 10:10:57 +02:00 |
|
Tim Daubenschütz
|
1db9921dd8
|
use safe urls for thumbnails and links
|
2015-07-01 10:00:53 +02:00 |
|
Tim Daubenschütz
|
929c694ad7
|
finalized delete functionality
|
2015-06-30 17:57:20 +02:00 |
|
Tim Daubenschütz
|
26442c9230
|
add margins to button lists
|
2015-06-30 17:12:13 +02:00 |
|
Tim Daubenschütz
|
2a5bd9173e
|
fix image scaling
|
2015-06-30 16:53:22 +02:00 |
|
Tim Daubenschütz
|
a4bf38085c
|
style pager buttons
|
2015-06-30 16:24:41 +02:00 |
|
Tim Daubenschütz
|
e31b6f0108
|
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload
Conflicts:
js/components/register_piece.js
|
2015-06-30 10:45:07 +02:00 |
|
diminator
|
8fc400bb01
|
licenses in registration
|
2015-06-30 10:42:58 +02:00 |
|
Tim Daubenschütz
|
52db729a4d
|
readd delete functionality
|
2015-06-29 17:59:35 +02:00 |
|
Tim Daubenschütz
|
e44ae60b75
|
first cut pause
|
2015-06-29 16:46:12 +02:00 |
|
diminator
|
e36681ad4d
|
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
|
2015-06-29 16:15:08 +02:00 |
|
diminator
|
f3677501c1
|
whitelabel subdomains
|
2015-06-29 15:58:47 +02:00 |
|
Tim Daubenschütz
|
dcb3e00e3a
|
styling for mobile
|
2015-06-29 14:36:55 +02:00 |
|
Tim Daubenschütz
|
867ebec134
|
fix styling for fineuploader
|
2015-06-29 13:41:37 +02:00 |
|
diminator
|
2c2ccd7891
|
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend
|
2015-06-26 11:52:59 +02:00 |
|
diminator
|
930982873a
|
Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend
|
2015-06-26 00:04:25 +02:00 |
|
diminator
|
b1ad4cc36f
|
withdraw transfer part one
|
2015-06-25 23:25:03 +02:00 |
|
diminator
|
fba30a565b
|
coa renders per page
verify
|
2015-06-25 14:39:39 +02:00 |
|
Tim Daubenschütz
|
08f574a42b
|
finish delete functionality
|
2015-06-25 14:15:02 +02:00 |
|
Tim Daubenschütz
|
b7e933c943
|
add delete buttons
|
2015-06-25 13:28:49 +02:00 |
|
Tim Daubenschütz
|
845f8c9cd3
|
fix issues related to multiple files upload
|
2015-06-25 11:12:40 +02:00 |
|
Tim Daubenschütz
|
ea88e87355
|
Merge branch 'AD-416-account-settings-page-navbar' of bitbucket.org:ascribe/onion into AD-416-account-settings-page-navbar
Conflicts:
sass/main.scss
|
2015-06-24 15:50:45 +02:00 |
|
ddejongh
|
41d70a9a15
|
Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar
Conflicts:
js/components/ascribe_forms/form.js
js/components/settings_container.js
sass/ascribe_settings.scss
|
2015-06-23 16:07:17 +02:00 |
|
ddejongh
|
95f6c08706
|
localization
|
2015-06-23 16:02:48 +02:00 |
|
ddejongh
|
6dd3e582df
|
fineuploader + register
|
2015-06-23 13:55:05 +02:00 |
|
ddejongh
|
3f3e9a273f
|
git removed s3-fineuploader
|
2015-06-23 10:27:19 +02:00 |
|
ddejongh
|
c8cb456709
|
Removed submodule react-s3
|
2015-06-23 10:16:53 +02:00 |
|
ddejongh
|
89884ced1f
|
edition detail updated with forms
|
2015-06-22 23:32:41 +02:00 |
|
ddejongh
|
02f8193743
|
style tweaks
|
2015-06-22 18:02:04 +02:00 |
|
ddejongh
|
9e1a76a08e
|
api settings complete
|
2015-06-22 17:33:25 +02:00 |
|
Tim Daubenschütz
|
cb3349c416
|
Merge branch 'AD-416-account-settings-page-navbar' of bitbucket.org:ascribe/onion into AD-416-account-settings-page-navbar
|
2015-06-22 10:55:43 +02:00 |
|
ddejongh
|
f836d4c2d4
|
register first cut
|
2015-06-22 10:50:22 +02:00 |
|
ddejongh
|
23190f6c48
|
signup/login
|
2015-06-20 16:43:18 +02:00 |
|
Tim Daubenschütz
|
2b861c4773
|
copy fineuploader theme
|
2015-06-19 13:17:40 +02:00 |
|
ddejongh
|
efc7f6d46b
|
Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar
Conflicts:
js/routes.js
|
2015-06-19 13:13:37 +02:00 |
|
ddejongh
|
c2d8b78136
|
settings
|
2015-06-18 19:03:03 +02:00 |
|
Tim Daubenschütz
|
3a8efb3dd6
|
Dimi and Tim styling action
|
2015-06-17 19:50:52 +02:00 |
|
Tim Daubenschütz
|
e2997891df
|
loading icon for piece list
|
2015-06-16 09:57:14 +02:00 |
|
Tim Daubenschütz
|
7910384d99
|
solve merge conflicts
|
2015-06-16 09:02:48 +02:00 |
|
Tim Daubenschütz
|
d41f5df3ee
|
separat ascribe-table css
|
2015-06-12 15:42:43 +02:00 |
|
Tim Daubenschütz
|
87bc6b3559
|
fix checkbox in edition list
|
2015-06-12 13:41:15 +02:00 |
|
Tim Daubenschütz
|
dcd770ab5f
|
readd sourcemaps
|
2015-06-12 13:36:55 +02:00 |
|
vrde
|
b9c8002495
|
Add ENV variable to handle BASE_URL
|
2015-06-09 17:53:44 +02:00 |
|
vrde
|
5445698eea
|
[wip] add temporary base url
|
2015-06-09 16:10:25 +02:00 |
|
ddejongh
|
30ee436f4c
|
Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
gulpfile.js
added notifications
cleaned up proptypes
|
2015-06-09 16:09:59 +02:00 |
|
Tim Daubenschütz
|
669f2b3ae7
|
resolve merge conflict
|
2015-06-09 13:38:01 +02:00 |
|
ddejongh
|
6563bf97b0
|
toggable textarea
|
2015-06-09 13:29:22 +02:00 |
|
Tim Daubenschütz
|
e0e75151e0
|
add first working prototype
|
2015-06-08 18:14:25 +02:00 |
|