1
0
mirror of https://github.com/ascribe/onion.git synced 2024-09-28 12:08:55 +02:00
Commit Graph

78 Commits

Author SHA1 Message Date
Tim Daubenschütz
81aeb478b7 Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k 2015-07-15 14:06:03 +02:00
Tim Daubenschütz
795a268184 loan form styling and loan contract store 2015-07-15 14:03:23 +02:00
diminator
c54bbe231f width styling of forms 2015-07-15 13:20:34 +02:00
diminator
9ba30f0938 acl_unshare false for prize
piece prize details
num_submissions
2015-07-15 12:23:02 +02:00
diminator
e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +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
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
733c95a070 loading feedback for piece and edition page 2015-07-13 15:21:09 +02:00
Tim Daubenschütz
3ae10c5e50 first cut loading spinner pieces 2015-07-13 15:00:12 +02:00
vrde
3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
Tim Daubenschütz
5011304939 fix spool color 2015-07-13 10:11:25 +02:00
diminator
e282da8474 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 17:52:39 +02:00
Tim Daubenschütz
b364414e16 input checkbox functionality 2015-07-10 15:56:54 +02:00
diminator
6a84e9d36e whitelabel logo + sluice 2015-07-10 11:59:03 +02:00
Tim Daubenschütz
c945fc315b various visual changes 2015-07-08 14:37:20 +02:00
diminator
787d48ad11 Merge remote-tracking branch 'origin/master' 2015-07-07 10:28:59 +02:00
diminator
fa2ae7cba8 styling changes for frontend 2015-07-07 10:28:39 +02:00
Tim Daubenschütz
d5fad09b60 loading animation for show more 2015-07-06 18:29:27 +02:00
Tim Daubenschütz
24af321669 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- 2015-07-02 16:51:43 +02:00
diminator
41da3b2029 footer + social icons 2015-07-02 15:41:17 +02:00
diminator
3556e8c3c2 ellipsis 2015-07-02 14:40:04 +02:00
Tim Daubenschütz
4b87d21259 add working slides container boilerplate 2015-07-02 13:31:35 +02:00
diminator
4ca2144c0c request actions in frontend 2015-07-01 19:05:47 +02:00
diminator
f58a65eb0c s3 views dont accept anonymous 2015-07-01 11:43:33 +02:00
diminator
ca3b058b4d Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 2015-07-01 11:22:49 +02:00
diminator
3e71926b7d register piece transitions 2015-07-01 11:21:43 +02:00
Tim Daubenschütz
d67bbe7770 made accordion table responsive 2015-07-01 10:53:40 +02:00
Tim Daubenschütz
929c694ad7 finalized delete functionality 2015-06-30 17:57:20 +02:00
Tim Daubenschütz
26442c9230 add margins to button lists 2015-06-30 17:12:13 +02:00
Tim Daubenschütz
a4bf38085c style pager buttons 2015-06-30 16:24:41 +02:00
Tim Daubenschütz
e31b6f0108 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload
Conflicts:
	js/components/register_piece.js
2015-06-30 10:45:07 +02:00
diminator
f3677501c1 whitelabel subdomains 2015-06-29 15:58:47 +02:00
diminator
2c2ccd7891 Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend 2015-06-26 11:52:59 +02:00
diminator
b1ad4cc36f withdraw transfer part one 2015-06-25 23:25:03 +02:00
Tim Daubenschütz
b7e933c943 add delete buttons 2015-06-25 13:28:49 +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
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
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
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
Tim Daubenschütz
3a8efb3dd6 Dimi and Tim styling action 2015-06-17 19:50:52 +02:00
Tim Daubenschütz
7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
Tim Daubenschütz
d41f5df3ee separat ascribe-table css 2015-06-12 15:42:43 +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
vrde
b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
ddejongh
30ee436f4c Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field-
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
2015-06-09 16:09:59 +02:00