ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,624 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

2624 Commits

Author SHA1 Message Date
Tim Daubenschütz 5c01a14524 add react fineuploader as a git submoduke 2015-06-17 15:40:01 +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
vrde ab8f4cb6aa Rebuild 2015-06-16 23:32:14 +02:00
vrde d7f5496a1e Rebuild 2015-06-16 22:13:21 +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
vrde 309248d157 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-06-16 14:24:19 +02:00
vrde 6b2f5ed094 Empty commit to please the Heroku Gods 2015-06-16 14:22:02 +02:00
diminator 8846a11e00 Merged in AD-44-in-piece-detail-support-public-not (pull request #2) 
CSRF and acl edit tweaks
 2015-06-16 14:18:15 +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 d41f5df3ee separat ascribe-table css 2015-06-12 15:42:43 +02:00
Tim Daubenschütz 2bb004d2fb remove edition list count in table 2015-06-12 15:00:26 +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
Tim Daubenschütz 7d5780d62a add another troubleshooting section 2015-06-12 10:14:34 +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 79f437179d Merge branch 'AD-43-in-piece_detail-add-generic-field-' of bitbucket.org:ascribe/onion into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	js/app.js
	js/constants/application_constants.js
 2015-06-11 17:10:17 +02:00
vrde fa97470e21 Enable CORS on the frontend 2015-06-11 17:07:27 +02:00
ddejongh 5e746295bc application constants 2015-06-11 16:24:37 +02:00
ddejongh 5e7f7983e1 application constants 2015-06-11 15:57:19 +02:00
ddejongh f4c6e025ae Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	js/constants/api_urls.js
	js/constants/application_constants.js
 2015-06-11 15:54:50 +02:00
ddejongh 4f5e7a0821 login form 2015-06-11 15:35:18 +02:00
ddejongh bf0a2aeefb consign unconsign requests 
async emails
 2015-06-11 15:03:55 +02:00
vrde 05b9792d3f Add some new constants to the app 2015-06-10 17:28:36 +02:00
ddejongh af71196dfd delete function for multi editions 2015-06-10 15:49:46 +02:00