1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 09:50:31 +01:00
Commit Graph

108 Commits

Author SHA1 Message Date
diminator
92971a9f62 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
Conflicts:
	sass/ascribe_accordion_list.scss
2015-09-02 10:50:33 +02:00
diminator
bfaf4886a4 notifications unoptimized 2015-09-01 14:45:14 +02:00
Tim Daubenschütz
b5b1e36109 nested collapsible paragraphs 2015-09-01 14:00:06 +02:00
vrde
d2adc7a388 Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss
Conflicts:
	sass/main.scss
2015-08-31 19:09:09 +02:00
vrde
99af814492 Lint scss 2015-08-31 19:04:47 +02:00
vrde
3f34fc680e Get rid of ascribe-btn-gray 2015-08-28 16:40:54 +02:00
diminator
762c3f89b9 Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col 2015-08-28 15:25:43 +02:00
diminator
d3cc6a5007 request actions first cut 2015-08-28 15:24:32 +02:00
Tim Daubenschütz
b67466d196 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-08-27 14:05:21 +02:00
Tim Daubenschütz
cd49a9c402 Create generic links in nav using routes 2015-08-25 16:33:26 +02:00
diminator
15bcd4ba14 average rating
cyland bug fix
2015-08-25 10:47:38 +02:00
Tim Daubenschütz
8a88f978c6 add start_from parameter to slide container 2015-08-19 15:30:48 +02:00
diminator
5b2e90a03c sorting acl and styling 2015-08-14 15:38:30 +02:00
diminator
247cca3ee2 piece rating + navigation OK
close prize
2015-08-13 13:28:09 +02:00
Tim Daubenschütz
81ff4641c7 fix prev and next button for navigationheader 2015-08-12 17:30:39 +02:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00
diminator
a27415eb86 jury dashboard + rating WIP 2015-08-10 15:23:13 +02:00
diminator
67f70357a5 jury invitation, revoke, resend
MIGRATE!
2015-08-07 11:27:44 +02:00
diminator
99ea0e1af8 action-panel WIP 2015-08-06 13:56:37 +02:00
diminator
deebacd063 Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22)
Ad 601 in piece_detail longer titles are
2015-07-29 14:16:40 +02:00
Tim Daubenschütz
d72844f29a fix alignment of elements (minor css) 2015-07-28 17:10:04 +02:00
TimDaubenschuetz
78049b448e Merged in AD-598-register-action-switches (pull request #14)
Ad 598 register action switches
2015-07-28 16:36:57 +02:00
Tim Daubenschütz
275f6c839e minor fixes 2015-07-27 18:24:21 +02:00
Tim Daubenschütz
1a1ba8bbb1 add ellipsis again 2015-07-27 18:19:55 +02:00
Tim Daubenschütz
23e6cc17b2 make dropzone inactive when user is logged out 2015-07-21 11:09:21 +02:00
Tim Daubenschütz
68dba56a21 refactor some scss variables and include css source map only in debug 2015-07-20 10:52:12 +02:00
Tim Daubenschütz
af42bb8e67 error handling first cut 2015-07-17 15:41:09 +02:00
Tim Daubenschütz
18a37057e5 fix edition id that was breaking viewport on mobile 2015-07-17 10:36:42 +02:00
Tim Daubenschütz
8d37efec40 fix layouting issues for sluice 2015-07-16 13:50:19 +02:00
Tim Daubenschütz
943c7503ea fix edition creation display bug on piece detail 2015-07-16 11:39:05 +02:00
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