ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
348 Commits 115 Branches 0 Tags 13 MiB
f836d4c2d4
Commit Graph

348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b4c2cd73a5 Merge remote-tracking branch 'remotes/origin/master' into AD-416-account-settings-page-navbar 
Conflicts:
	.gitmodules
	node_modules/react-s3-fineuploader
 2015-06-19 09:52:27 +02:00
ddejongh
e369eac889 submodules 2015-06-18 19:48:31 +02:00
ddejongh
dda8c91db9 submodules 2015-06-18 19:41:47 +02:00
ddejongh
ec6cd38709 test submodules 2015-06-18 19:36:17 +02:00
ddejongh
de6f5a41e0 settings 2015-06-18 19:26:20 +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
TimDaubenschuetz
a4389ce985 git-submodule-workflow.md edited online with Bitbucket 2015-06-17 19:52:52 +00: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
Tim Daubenschütz
8a0ac74da0 transfer refactor todo list from gdrive to repo 2015-06-17 17:18:59 +02:00
Tim Daubenschütz
2f1d7bc010 add git submodule workflow documentation 2015-06-17 17:15:21 +02:00
Tim Daubenschütz
82ceba614e finish including react-s3-fineuploader as a git submodule 2015-06-17 16:52:40 +02:00
Tim Daubenschütz
4b7ce61d6d add react-s3-fineuploader as git submodule 2015-06-17 15:50:07 +02:00
Tim Daubenschütz
e139fd4208 remove submodule 2015-06-17 15:45:43 +02:00
ddejongh
1eb85786fe Merge remote-tracking branches 'remotes/origin/AD-44-in-piece-detail-support-public-not' and 'remotes/origin/master' into AD-416-account-settings-page-navbar 2015-06-17 15:42:00 +02:00
Tim Daubenschütz
3538585448 Merge branch 'master' of bitbucket.org:ascribe/onion 2015-06-17 15:40:26 +02:00
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