diminator
|
fba30a565b
|
coa renders per page
verify
|
2015-06-25 14:39:39 +02:00 |
|
diminator
|
1c116bc7be
|
Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend
|
2015-06-24 18:02:32 +02:00 |
|
Tim Daubenschütz
|
8b2096600c
|
Merge branch 'master' of bitbucket.org:ascribe/onion
Conflicts:
README.md
|
2015-06-24 17:55:11 +02:00 |
|
Tim Daubenschütz
|
febfd7e56e
|
make api dependent on onion server url
|
2015-06-24 17:54:32 +02:00 |
|
diminator
|
2cbfd2d8ee
|
Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend
|
2015-06-24 17:51:38 +02:00 |
|
TimDaubenschuetz
|
857aa8e0bb
|
README.md edited online with Bitbucket
|
2015-06-24 15:47:01 +00:00 |
|
diminator
|
c2cff6a63a
|
removed src
fixed emails in notification instead of username
|
2015-06-24 17:44:05 +02:00 |
|
Tim Daubenschütz
|
296a1fd552
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-06-24 17:00:56 +02:00 |
|
Tim Daubenschütz
|
7e530ceb0f
|
added readme for local development with spool
|
2015-06-24 17:00:45 +02:00 |
|
diminator
|
b82b72cf84
|
README.md edited online with Bitbucket
|
2015-06-24 14:03:18 +00:00 |
|
Tim Daubenschütz
|
bf2a766e84
|
implement submission for autofill firefox and chrome
|
2015-06-24 15:52:43 +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
|
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
|
946037a300
|
submodules
|
2015-06-23 14:23:44 +02:00 |
|
ddejongh
|
a302594043
|
test
|
2015-06-23 14:15:47 +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 |
|
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 |
|
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
|
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 |
|