ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
481 Commits 115 Branches 0 Tags 13 MiB
59cc9cbbce
Commit Graph

385 Commits

Author SHA1 Message Date
diminator
6660065cad signup process complete + subdomained 2015-06-30 14:46:28 +02:00
Tim Daubenschütz
8c3dfc4b73 made download functionality optional 2015-06-30 13:53:02 +02:00
Tim Daubenschütz
ea47f7a371 add place holder for empty piece list 2015-06-30 13:32:41 +02:00
Tim Daubenschütz
1976dee57a fix firefox simulate click issue 2015-06-30 11:56:38 +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
e7f29cd973 fix bug in edition detail 2015-06-30 09:23:26 +02:00
Tim Daubenschütz
31e3c23302 rename upload status variable 2015-06-30 09:20:20 +02:00
Tim Daubenschütz
52db729a4d readd delete functionality 2015-06-29 17:59:35 +02:00
Tim Daubenschütz
f1d3b3968f Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 2015-06-29 17:37:51 +02:00
Tim Daubenschütz
a66a4e1c9f add pause and play functionality 2015-06-29 17:37:14 +02:00
diminator
c6bc34c2f7 otherdata POST and fineuploader_session OK 2015-06-29 17:21:14 +02:00
Tim Daubenschütz
dbbf9fd233 debug 2015-06-29 16:57:31 +02:00
Tim Daubenschütz
e44ae60b75 first cut pause 2015-06-29 16:46:12 +02:00
Tim Daubenschütz
8064fdb39d Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 2015-06-29 16:19:04 +02:00
Tim Daubenschütz
90e8278504 integrate file sessions for edition detail 2015-06-29 16:17:57 +02:00
diminator
ea770943f2 editions and api_urls 2015-06-29 16:15:41 +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
Tim Daubenschütz
6c44333f1a add file drag and drop toolbar 2015-06-29 16:00:26 +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
Tim Daubenschütz
a87f2eb272 refactor form validation 2015-06-29 11:44:16 +02:00
Tim Daubenschütz
1a9c82d683 finalize delete and cancel functionality 2015-06-29 11:01:45 +02:00
Tim Daubenschütz
66fff1c50a implement cancel functionality 2015-06-29 10:01:54 +02:00
diminator
5916c27c45 uploader defaultprops 2015-06-29 10:00:26 +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
eff25a9801 withdraw transfer with delete of transfer record 2015-06-26 11:44:35 +02:00
diminator
99d6dd278c withdraw fix 2015-06-26 01:05:20 +02:00
diminator
7e115e26ad withdraw transfer part one 2015-06-26 00:38:40 +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
64017f604c login location with baseurl 2015-06-25 15:30:47 +02:00
diminator
93c1b2e826 login location with baseurl 2015-06-25 15:25:34 +02:00
diminator
d980ef7949 verify button link 2015-06-25 15:23:10 +02:00
diminator
fba30a565b coa renders per page 
verify
 2015-06-25 14:39:39 +02:00
Tim Daubenschütz
12da6c1426 add todo 2015-06-25 14:18:55 +02:00
Tim Daubenschütz
08f574a42b finish delete functionality 2015-06-25 14:15:02 +02:00
Tim Daubenschütz
ae17d2cb03 first cut: delete functionality 2015-06-25 13:46:10 +02:00
Tim Daubenschütz
b7e933c943 add delete buttons 2015-06-25 13:28:49 +02:00
Tim Daubenschütz
c478bbce9a add redirect if user is logged in to sign up page 2015-06-25 12:56:43 +02:00
Tim Daubenschütz
761138dbf6 add redirect to login page if user is logged in 2015-06-25 11:49:45 +02:00
Tim Daubenschütz
0ce56a0821 improve usability 2015-06-25 11:29:42 +02:00
Tim Daubenschütz
845f8c9cd3 fix issues related to multiple files upload 2015-06-25 11:12:40 +02:00
Tim Daubenschütz
b9f8be6636 remove console logs 2015-06-25 10:42:35 +02:00
Tim Daubenschütz
2f7bbd01b8 fix multiple attribute for fine uploader 2015-06-25 10:35:25 +02:00
Tim Daubenschütz
bf2a766e84 implement submission for autofill firefox and chrome 2015-06-24 15:52:43 +02:00
ddejongh
208e580985 share + email combined 2015-06-23 17:01:15 +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
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
ddejongh
e1dbc0e183 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 14:05:56 +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
48d44c0a30 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 11:01:06 +02:00
ddejongh
6c746d09f7 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 10:53:56 +02:00
ddejongh
c2d8b78136 settings 2015-06-18 19:03:03 +02:00
ddejongh
9b3c7e9f21 CC google tag manager 2015-06-18 10:35:36 +02:00
Tim Daubenschütz
3a8efb3dd6 Dimi and Tim styling action 2015-06-17 19:50:52 +02:00
Tim Daubenschütz
cd9c561ddf boilerplate for piece registration 2015-06-17 17:48:52 +02:00
ddejongh
fabff2922c account settings 2015-06-17 17:48:23 +02:00
vrde
41b0a33d93 Merge branch 'master' into AD-44-in-piece-detail-support-public-not 2015-06-17 10:46:31 +02:00
vrde
5165fa6c8c Fix https schema for jquery 2015-06-17 10:16:28 +02:00
ddejongh
37dfde83b0 Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not 2015-06-16 20:37:01 +02:00
ddejongh
d50b3ca14d fixed logout 2015-06-16 20:35:19 +02:00
vrde
bd2be63341 Fix empty X-CSRFToken bug 2015-06-16 19:28:21 +02:00
ddejongh
ff12048c10 edition note 2015-06-16 16:38:22 +02:00
ddejongh
9cf060fdc4 csrf subdomain 2015-06-16 14:49:00 +02:00
vrde
dfd4435e27 Fix baseUrl to load shmui 2015-06-16 14:42:36 +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
vrde
a247e111c0 Merge branch 'AD-421-add-signup-functionality' 
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
 2015-06-16 10:58:41 +02:00
ddejongh
3784d53609 code review 2015-06-16 10:02:55 +02:00
Tim Daubenschütz
1c8ac24127 replace amazon links 2015-06-16 09:59:09 +02:00
Tim Daubenschütz
e2997891df loading icon for piece list 2015-06-16 09:57:14 +02:00
Tim Daubenschütz
1ce9b90fff Fix pagination on search bug 2015-06-16 09:27:04 +02:00
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
ddejongh
cf3b7f234d password reset ok 2015-06-15 16:56:17 +02:00
Tim Daubenschütz
8ceabda1c5 add queryparams modal 2015-06-15 15:46:33 +02:00
ddejongh
56d32efcc0 password reset 
modal switch problems
 2015-06-15 15:28:53 +02:00
ddejongh
66f8a6a1ca login/logout functional 2015-06-15 12:36:27 +02:00
vrde
07686f514f Fix (hopefully) CORS 2015-06-15 11:55:50 +02:00
ddejongh
aac8ae2a9e merged master 2015-06-15 11:02:49 +02:00
ddejongh
4e1ef9fc72 Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 2015-06-15 09:59:53 +02:00
Tim Daubenschütz
6e7037e5f2 Finish implementing refactor for open and close for edition lists 2015-06-15 09:29:34 +02:00
Tim Daubenschütz
989b121678 Fix mangling issue 2015-06-15 08:44:44 +02:00
root
9cc70dc4c9 refactor open state of edition table first cut 2015-06-12 17:18:40 +02:00
Tim Daubenschütz
2bb004d2fb remove edition list count in table 2015-06-12 15:00:26 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00
ddejongh
6ef233e43d Merge remote-tracking branch 'origin/AD-43-in-piece_detail-add-generic-field-' into AD-43-in-piece_detail-add-generic-field- 2015-06-11 17:22:27 +02:00
ddejongh
0f1108b14e form password + signup 2015-06-11 17:22:11 +02:00
vrde
fa97470e21 Enable CORS on the frontend 2015-06-11 17:07:27 +02:00