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
667 Commits 115 Branches 0 Tags 13 MiB
5ae80efaa7
Commit Graph

85 Commits

Author SHA1 Message Date
Tim Daubenschütz
5ae80efaa7 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-14 21:18:32 +02:00
Tim Daubenschütz
483e24b234 add missing language strings 2015-07-14 21:18:05 +02:00
vrde
5ced62c496 Cleanup constants 2015-07-14 20:06:13 +02:00
Tim Daubenschütz
ff64734545 styling 2015-07-14 17:41:57 +02:00
Tim Daubenschütz
5ef63fbba3 use local whitelabel constants for route switching 2015-07-14 17:12:32 +02:00
Tim Daubenschütz
8d15238818 add subdomain settings to constants 2015-07-14 16:53:27 +02:00
diminator
9a7bf46675 acl WIP 2015-07-13 23:57:16 +02:00
Tim Daubenschütz
60600a72d4 refactor bulk acls for backend adjustment 2015-07-13 21:19:45 +02:00
Tim Daubenschütz
6e1cf55841 Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_create_editions.js
 2015-07-13 18:54:06 +02:00
vrde
b4f1d3d6cc Merge branch 'master' into AD-565-add-landing-page-for-sluice 
Conflicts:
	js/components/login_container.js
 2015-07-13 17:19:23 +02:00
Tim Daubenschütz
e71c2f9fe0 separate create edition form logic 2015-07-13 17:09:44 +02:00
vrde
3878dc12da Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 16:35:49 +02:00
Tim Daubenschütz
ad6dd40867 Merge branch 'master' into AD-419-decouple-piece-registration-from- 2015-07-13 15:31:44 +02:00
Sylvain Bellemare
1497ed45eb removed messages indicating that the email is valid 2015-07-13 14:36:29 +02:00
vrde
3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
diminator
a07bc9e0e2 piece + share 
acl first cut
 2015-07-13 14:10:46 +02:00
diminator
88ff4b55d6 acl buttons and share forms for pieces/editions 2015-07-10 20:00:35 +02:00
Tim Daubenschütz
b364414e16 input checkbox functionality 2015-07-10 15:56:54 +02:00
Tim Daubenschütz
1df068d75f add edition creation functionality 2015-07-10 13:54:25 +02:00
Tim Daubenschütz
bcb1bbe29b first cut edition creation in piece list item 2015-07-10 10:32:39 +02:00
diminator
bf0a36f2a3 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:59:16 +01:00
diminator
fd8859fd22 Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_detail/edition.js
 2015-07-09 14:54:11 +01:00
Tim Daubenschütz
773cab6505 remove piece list edition table toggle and put it inside of accordion list item 2015-07-09 14:04:48 +02:00
Tim Daubenschütz
35a287b8a1 made edition registration optional 2015-07-09 11:56:54 +02:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00
Sylvain Bellemare
f066008ce9 translated english text to french 2015-07-08 09:57:50 +02:00
diminator
fa2ae7cba8 styling changes for frontend 2015-07-07 10:28:39 +02:00
Sylvain Bellemare
3eedda7724 [WIP] adding localisation support for French 2015-07-02 19:13:40 +02:00
diminator
18f3b51153 fineuploader session with cors 2015-07-02 11:54:33 +02:00
diminator
4ca2144c0c request actions in frontend 2015-07-01 19:05:47 +02:00
diminator
5f372eedda edition_index + default license 2015-07-01 15:28:48 +02:00
Tim Daubenschütz
a4fd7fc837 rename bitcoin address to id 2015-07-01 10:59:06 +02:00
Tim Daubenschütz
9ce6c45690 add sessions for already uploaded files and implement manual deletion 2015-06-30 15:41:39 +02:00
diminator
8fc400bb01 licenses in registration 2015-06-30 10:42:58 +02:00
diminator
ea770943f2 editions and api_urls 2015-06-29 16:15:41 +02:00
diminator
f3677501c1 whitelabel subdomains 2015-06-29 15:58:47 +02:00
diminator
eff25a9801 withdraw transfer with delete of transfer record 2015-06-26 11:44:35 +02:00
diminator
fba30a565b coa renders per page 
verify
 2015-06-25 14:39:39 +02:00
ddejongh
208e580985 share + email combined 2015-06-23 17:01:15 +02:00
ddejongh
6dd3e582df fineuploader + register 2015-06-23 13:55:05 +02:00
ddejongh
9e1a76a08e api settings complete 2015-06-22 17:33:25 +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
ddejongh
fabff2922c account settings 2015-06-17 17:48:23 +02:00
ddejongh
9cf060fdc4 csrf subdomain 2015-06-16 14:49:00 +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
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
ddejongh
66f8a6a1ca login/logout functional 2015-06-15 12:36:27 +02:00
ddejongh
aac8ae2a9e merged master 2015-06-15 11:02:49 +02:00
Tim Daubenschütz
dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00