1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Commit Graph

47 Commits

Author SHA1 Message Date
Tim Daubenschütz
cfab59c027 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-25 16:23:22 +02:00
Tim Daubenschütz
f2b4c23bd7 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
	js/routes.js
2015-09-25 16:23:01 +02:00
Tim Daubenschütz
e20e378533 Remove PrizeDashboard from codebase, add coa_verify to prize app 2015-09-25 11:54:12 +02:00
Tim Daubenschütz
2a4bc2af89 separate contract settings from account settings 2015-09-23 15:16:46 +02:00
diminator
9b7a69bc20 contract agreement notifications 2015-09-04 11:49:55 +02:00
diminator
73ee0753c1 refactored notifications per detail 2015-09-03 17:25:22 +02:00
Tim Daubenschütz
7e1815bb1f refactor account settings into multiple files 2015-08-31 16:36:24 +02:00
Tim Daubenschütz
9d7a9bd028 add router/navigation integration into whole project 2015-08-27 14:34:15 +02:00
Tim Daubenschütz
ac45283968 first iteration: whitelabel pages depending on customer 2015-08-11 17:40:26 +02:00
Tim Daubenschütz
eb6e3cb20a finishing boilerplate for wallet app + prefixing whitelabel specific files 2015-08-11 14:47:28 +02:00
Tim Daubenschütz
4f2aa430f2 refactor ascribe table and add prizes dashboard boilerplate code 2015-07-29 18:03:49 +02:00
vrde
b536af29be Logout is now a route 2015-07-17 15:02:44 +02:00
Tim Daubenschütz
ff64734545 styling 2015-07-14 17:41:57 +02:00
diminator
eb5e9f115e merged sluice 2015-07-13 21:20:42 +02:00
vrde
df5295dffd Cleanup and reorder routes 2015-07-10 18:21:42 +02:00
vrde
d5ea4e515d Use distinct routers for different apps 2015-07-10 16:43:35 +02:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00
diminator
fba30a565b coa renders per page
verify
2015-06-25 14:39:39 +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
89884ced1f edition detail updated with forms 2015-06-22 23:32:41 +02:00
ddejongh
23190f6c48 signup/login 2015-06-20 16:43:18 +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
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
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
vrde
b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
vrde
5445698eea [wip] add temporary base url 2015-06-09 16:10:25 +02:00
Tim Daubenschütz
f987bce7cc add es6lint to build process and fix most (not really) errors and warnings 2015-06-05 11:06:36 +02:00
Tim Daubenschütz
ed66c4150e refactor routes 2015-06-01 09:05:30 +02:00
ddejongh
bcf8756cd3 edition 2015-05-26 13:48:46 +02:00
Tim Daubenschütz
54866cda84 Improved naming 2015-05-26 10:52:20 +02:00
Tim Daubenschütz
1cb0b54f77 Added PieceDetail boilerplate code 2015-05-26 10:41:41 +02:00
vrde
0a2895e0d6 Pagination works, it still needs some love 2015-05-21 17:54:27 +02:00
vrde
8ee9bda37b Fix spacing 2015-05-20 16:44:45 +02:00
Tim Daubenschütz
ba71bd5788 refactor to use AltContainer to start developing the new table component 2015-05-20 11:32:56 +02:00
Tim Daubenschütz
5080de1481 Add boilerplate table and tableitem. Also integrate bootstrap 2015-05-20 11:16:42 +02:00
Tim Daubenschütz
60c4b3ac8b fix refactor fault 2015-05-20 09:08:26 +02:00
Tim Daubenschütz
2b8e1d604b refactor: use let instead of var 2015-05-19 17:16:01 +02:00
Tim Daubenschütz
9784e09aac refactor: rename artwork to piece and artworkList to pieceList 2015-05-19 17:13:09 +02:00
Tim Daubenschütz
47246a9083 create artwork component 2015-05-19 17:01:28 +02:00
vrde
5dd7cd7554 Refactor a bit 2015-05-18 18:00:12 +02:00
Tim Daubenschütz
c6097fe5c2 outsourced routes to separate file and created a boilerplate action and store 2015-05-18 13:43:42 +02:00
Tim Daubenschütz
6ae7ff0d4b code formatting 2015-05-18 09:59:45 +02:00
Tim Daubenschütz
25a715ddb3 continuing file structure 2015-05-18 09:56:16 +02:00