ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
993 Commits 115 Branches 0 Tags 13 MiB
6425870864
Commit Graph

993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
diminator
6425870864 Merged in AD-422-staging-rest-api-ignores-ordering (pull request #38) 
Ad 422 staging rest api ignores ordering
 2015-08-14 17:11:54 +02:00
diminator
5b2e90a03c sorting acl and styling 2015-08-14 15:38:30 +02:00
diminator
e843e2fa52 order by rating 2015-08-14 14:58:23 +02:00
diminator
775c4fbda3 staging https settings 2015-08-13 17:06:27 +02:00
diminator
9d9aa3aea4 staging https settings 2015-08-13 17:02:13 +02:00
diminator
d7cffeaf9f staging https settings 2015-08-13 16:50:28 +02:00
diminator
d24b325062 bug fix loadPiece 2015-08-13 14:16:44 +02:00
diminator
722898b0e3 Merged in AD-545-add-rating-support-for-the-pieces (pull request #37) 
Ad 545 add rating support for the pieces
 2015-08-13 13:30:43 +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
7c0e2312a1 revert piece navigation and bug fix in navigation serializer 2015-08-12 17:09:48 +02:00
diminator
97c298e304 piece navigation prev next WIP 2015-08-12 16:47:16 +02:00
diminator
c25de71b4b notes and bug fixes 2015-08-12 13:21:05 +02:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00
diminator
d5efd79d14 refactored accordion list item: 
accordion-list-item
accordion-list-item-piece < accordion-list-item
accordion-list-item-wallet < accordion-list-item-piece
accordion-list-item-prize < accordion-list-item-piece
 2015-08-11 12:06:01 +02:00
diminator
f5b34222a9 remove ratings from master branch 2015-08-10 17:45:49 +02:00
diminator
a6e257bd27 Merged in AD-545-add-rating-support-for-the-pieces (pull request #36) 
Ad 545 add rating support for the pieces
 2015-08-10 17:08:11 +02:00
diminator
bdeef598eb Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r' 
Conflicts:
	js/components/settings_container.js
 2015-08-10 17:07:15 +02:00
diminator
9408370239 Merged in AD-707-add-https-to-embed (pull request #33) 
Add "s" to http
 2015-08-10 17:03:16 +02:00
diminator
b508df2045 Merged in AD-544-automatically-share-registered-pr (pull request #34) 
Ad 544 automatically share registered pr
 2015-08-10 17:02:59 +02:00
diminator
36ca2004ff rating create and fetch 2015-08-10 17:02:10 +02:00
Tim Daubenschütz
8ff2dea4df refactor: acl buttons message functionality 2015-08-10 15:57:20 +02:00
diminator
a27415eb86 jury dashboard + rating WIP 2015-08-10 15:23:13 +02:00
Tim Daubenschütz
3c75237275 update refactor.md 2015-08-10 15:10:21 +02:00
Tim Daubenschütz
cde6118b8e panel styling 2015-08-10 14:57:06 +02:00
Tim Daubenschütz
d12dc4dab2 remove deprecated collapsible mixin 2015-08-10 14:42:38 +02:00
Tim Daubenschütz
f6be11d530 remove alert mixin 2015-08-10 14:22:25 +02:00
Tim Daubenschütz
ada07e707e switch action wording 2015-08-10 14:20:26 +02:00
Tim Daubenschütz
5be771f6ac add inline property to form 2015-08-10 14:15:32 +02:00
Tim Daubenschütz
4b8987dc7c add urls 2015-08-10 14:07:23 +02:00
Tim Daubenschütz
3137583b0f adjust button choose logic 2015-08-10 14:06:01 +02:00
Tim Daubenschütz
e589925c9d delete form mixin 2015-08-10 14:05:35 +02:00
Tim Daubenschütz
d968f02b59 refactor request action form 2015-08-10 11:57:38 +02:00
Tim Daubenschütz
c8dc4fa12d adjust action panel usage for applications 2015-08-10 11:11:28 +02:00
diminator
d1edf898fc api tokens with panel instead of property 
Conflicts:
	js/components/settings_container.js
 2015-08-10 11:08:18 +02:00
Tim Daubenschütz
3ff401904b fix submit to prize button 2015-08-10 10:10:43 +02:00
Tim Daubenschütz
a55efc1692 fix large buttons on sluice landing page 2015-08-10 09:39:32 +02:00
Tim Daubenschütz
b70eb23dc0 refactor action panel: mostly css and layout 2015-08-10 09:22:39 +02:00
diminator
36aa5b1891 api tokens with panel instead of property 2015-08-07 15:54:36 +02:00
diminator
4627a860b2 Merge remote-tracking branch 'remotes/origin/master' into AD-544-automatically-share-registered-pr 2015-08-07 15:17:12 +02:00
Tim Daubenschütz
5cef512c0d remove react flow type 2015-08-07 15:10:47 +02:00
diminator
8275a8d626 prize: permission refactor 
email: moved cc folders
bug fix email: encode email in queryparams
 2015-08-07 15:10:39 +02:00
Tim Daubenschütz
3afb036f24 rename apiUrls to ApiUrls 2015-08-07 15:08:02 +02:00
Tim Daubenschütz
be62ece14e Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r 2015-08-07 14:54:11 +02:00
TimDaubenschuetz
a2b366a7bf Merged AD-391-add-filter-functions-to-pieces-an into master 2015-08-07 14:51:07 +02:00
Tim Daubenschütz
b56ae0e145 fix requestActions requests 2015-08-07 14:50:34 +02:00
Tim Daubenschütz
f73001a5b8 remove form property header and replace class name definition 2015-08-07 14:31:37 +02:00
vrde
e9c776fec4 Add "s" to http lol 2015-08-07 14:23:59 +02:00
Tim Daubenschütz
8f9c699b69 Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r 
Conflicts:
	js/components/ascribe_buttons/submit_to_prize_button.js
	js/components/ascribe_forms/form.js
	js/components/ascribe_forms/form_loan.js
 2015-08-07 14:10:05 +02:00
Tim Daubenschütz
15c0ae6430 Merge branch 'AD-391-add-filter-functions-to-pieces-an' 2015-08-07 13:24:36 +02:00