ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-24 10:26:09 +01:00
Code Issues Releases Wiki Activity
1,111 Commits 115 Branches 0 Tags 13 MiB
73c5ab56c3
Commit Graph

1111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vrde
73c5ab56c3 playing around with the styleguide app 2015-08-28 11:06:25 +02:00
diminator
b229dbb79f Merged in AD-661-due-1208-implement-jury-rating-an (pull request #40) 
Ad 661 due 1208 implement jury rating an
 2015-08-27 13:48:16 +02:00
diminator
bc28f3d8f5 loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
diminator
79106dd106 loan request + answer complete 2015-08-27 11:38:21 +02:00
diminator
8406272187 review comments 2015-08-27 10:18:50 +02:00
diminator
33d5480f2f review comments 2015-08-27 10:10:39 +02:00
diminator
11c42fc997 Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an 2015-08-27 09:38:43 +02:00
diminator
144b823777 Merge remote-tracking branch 'origin/AD-661-due-1208-implement-jury-rating-an' into AD-661-due-1208-implement-jury-rating-an 2015-08-27 09:22:08 +02:00
diminator
1f95ae3a41 show email of user registered on select 2015-08-27 09:21:48 +02:00
vrde
65ae11ca16 Merge branch 'AD-862-remove-confusion-introduced-in-prev-update' 2015-08-26 18:06:26 +02:00
Tim Daubenschütz
8cc1f91a3a Merge branch 'AD-661-due-1208-implement-jury-rating-an' of bitbucket.org:ascribe/onion into AD-661-due-1208-implement-jury-rating-an 2015-08-26 18:05:22 +02:00
Tim Daubenschütz
b4f68f23e8 update react-datepicker DO NPM INSTALL 2015-08-26 18:03:58 +02:00
Tim Daubenschütz
6028812128 adjust loan form to disable dates 2015-08-26 18:01:50 +02:00
diminator
65571848fb ordering by selected 2015-08-26 17:41:36 +02:00
Tim Daubenschütz
e473b4c779 fix invariant violation 2015-08-26 17:32:42 +02:00
diminator
19c882f3b4 reveal name on shortlist in list 2015-08-26 16:55:12 +02:00
diminator
c64aae332d Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an 2015-08-26 16:54:41 +02:00
Tim Daubenschütz
6808c7c228 remove loan button from piece detail page 2015-08-26 16:44:24 +02:00
diminator
6530149971 problem with loanForm 2015-08-26 16:34:41 +02:00
diminator
ab97fa420c loan request with moment 
shortlist on accordeonlist OK
 2015-08-26 15:46:27 +02:00
Tim Daubenschütz
1f8c8a7d9e (hopefully) fix auto-fill bug for safari/chrome 2015-08-26 15:41:59 +02:00
Tim Daubenschütz
88b525f352 change link in accordionlist item dependent on domain 2015-08-26 15:18:05 +02:00
diminator
bcd6400a78 bug fix promises and notifications 2015-08-26 14:50:16 +02:00
diminator
e3b85bf808 removed loadPieceList from shortlist in detail 2015-08-26 12:51:25 +02:00
diminator
ad7e86108e prize piece serializer with DB rating stats 2015-08-26 12:33:06 +02:00
diminator
b2fed6426f loan request up till accept 2015-08-26 09:50:38 +02:00
diminator
5fcee39ed3 shortlisting enabled up till loan request 2015-08-25 15:19:10 +02:00
diminator
a07b4cc35c reset cyland register form 
"no votes yet" for judge
 2015-08-25 11:11:22 +02:00
diminator
2d10887e1b reset cyland additional data form 2015-08-25 10:49:49 +02:00
diminator
15bcd4ba14 average rating 
cyland bug fix
 2015-08-25 10:47:38 +02:00
diminator
1b335e31a4 Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an 2015-08-24 16:45:03 +02:00
diminator
bfbb96311c Merged in AD-613-cyland-white-label-page (pull request #39) 
Ad 613 cyland white label page
 2015-08-24 15:39:56 +02:00
diminator
70c39794b4 sluice judge + average WIP 2015-08-24 15:33:36 +02:00
Tim Daubenschütz
18634ffe50 fix additional files button bug 2015-08-24 14:16:13 +02:00
Tim Daubenschütz
f54d7bb85c fix validation method 2015-08-24 13:57:02 +02:00
Tim Daubenschütz
07ae8cc9bb Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-24 13:13:08 +02:00
Tim Daubenschütz
c14ab4dcd4 fix fineuploader notification bug 2015-08-24 13:12:59 +02:00
diminator
b76c752966 Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an 
Conflicts:
	ownership/test/test_api.py
	piece/models.py
 2015-08-24 12:20:54 +02:00
diminator
411b7cb010 increase otherdata limit to 50MB 2015-08-24 12:11:07 +02:00
diminator
440dcd9785 Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page 2015-08-24 11:36:30 +02:00
diminator
54ec829588 notes in cyland 2015-08-24 11:35:35 +02:00
Tim Daubenschütz
96fe1c69c6 Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-24 11:22:54 +02:00
Tim Daubenschütz
d05662b879 fix PR issues 2015-08-24 11:22:44 +02:00
diminator
0be6b7f118 bug fix loadPiece 2015-08-24 11:01:42 +02:00
diminator
3b27238adf request form on piece level 
bug fix cyland piece endpoint
bug fix otherDataUploader editable
 2015-08-24 10:48:40 +02:00
diminator
7a09b863b5 switch between request action and acl buttons on piece detail page 2015-08-21 16:49:04 +02:00
diminator
8b6c5e6e0f username boolean 2015-08-21 16:39:06 +02:00
diminator
33cd23d11e getlangtext 2015-08-21 16:38:18 +02:00
diminator
f564ce7959 Merge remote-tracking branch 'origin/AD-613-cyland-white-label-page' into AD-613-cyland-white-label-page 2015-08-21 16:24:22 +02:00
diminator
ea9fb306c4 add request action loan to piece 2015-08-21 16:22:08 +02:00