Tim Daubenschütz
|
2c9370e555
|
restyle contract settings list
|
2015-09-08 10:03:20 +02:00 |
|
Tim Daubenschütz
|
3197fad1b6
|
fix bug in progress method
|
2015-09-07 17:49:38 +02:00 |
|
Cevo
|
86306fc089
|
console.log remove from requests.js
|
2015-09-07 16:36:31 +02:00 |
|
Cevo
|
66cd4a1d7b
|
git ignore removed
|
2015-09-07 16:33:21 +02:00 |
|
Cevo
|
632c04149d
|
tabs inserted in jsx
|
2015-09-07 15:43:44 +02:00 |
|
Cevo
|
6b9bf03941
|
tabs inserted in jsx
|
2015-09-07 15:08:01 +02:00 |
|
Cevo
|
1dba9196e7
|
tabs inserted in jsx
|
2015-09-07 14:30:45 +02:00 |
|
diminator
|
22aa0139ae
|
terms and conditions page with accept/deny
Needed: copyright societies in backend
|
2015-09-07 12:03:59 +02:00 |
|
Tim Daubenschütz
|
1c4bf9915c
|
refactor setState actions to fix overriding values bug
|
2015-09-07 12:02:01 +02:00 |
|
Cevo
|
501d7ac7c0
|
now committing the remove contract
|
2015-09-07 11:38:23 +02:00 |
|
Cevo
|
ae21686f26
|
slash added to route
|
2015-09-07 10:23:39 +02:00 |
|
diminator
|
1611a75036
|
Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col
Conflicts:
ownership/serializers.py
|
2015-09-04 16:48:00 +02:00 |
|
Tim Daubenschütz
|
bf6b5e00a6
|
update fineuploader
|
2015-09-04 16:39:57 +02:00 |
|
Tim Daubenschütz
|
bb6deb3f68
|
refactor setStatus method of fineuploader
|
2015-09-04 15:13:38 +02:00 |
|
Tim Daubenschütz
|
8e98a7bff7
|
show overall progress
|
2015-09-04 14:54:39 +02:00 |
|
diminator
|
4bdab3410e
|
contractagreementserializer with contract fully expanded
|
2015-09-04 14:48:10 +02:00 |
|
diminator
|
8a49006592
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-04 11:51:17 +02:00 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +02:00 |
|
Cevo
|
f312c94eeb
|
if there is anything else
|
2015-09-04 11:31:53 +02:00 |
|
Cevo
|
eb4994b05e
|
add more
|
2015-09-03 18:25:12 +02:00 |
|
Tim Daubenschütz
|
ac28ef4ee0
|
remove raven
|
2015-09-04 18:15:42 +02:00 |
|
Tim Daubenschütz
|
4374235c1b
|
use log global again
|
2015-09-03 17:55:15 +02:00 |
|
Tim Daubenschütz
|
3b61ac5c6a
|
remove mangle and fix bug in react-fineuploader
|
2015-09-04 17:31:58 +02:00 |
|
Tim Daubenschütz
|
ec1def31fb
|
Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' into AD-914-fix-sentry-logging
|
2015-09-04 17:16:54 +02:00 |
|
Tim Daubenschütz
|
7dae23a265
|
remove fastly
|
2015-09-04 17:05:17 +02:00 |
|
Tim Daubenschütz
|
bc0ac05d2d
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-09-04 16:25:47 +02:00 |
|
diminator
|
6a1f58fdb4
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-03 17:37:40 +02:00 |
|
diminator
|
73ee0753c1
|
refactored notifications per detail
|
2015-09-03 17:25:22 +02:00 |
|
Cevo
|
57c4076c1e
|
pushing the contract u[pdate on client side
|
2015-09-03 17:19:29 +02:00 |
|
Tim Daubenschütz
|
8a75e94413
|
fix bug
|
2015-09-04 16:24:29 +02:00 |
|
Tim Daubenschütz
|
85efa4b416
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-04 15:55:07 +02:00 |
|
Tim Daubenschütz
|
a4a0e9d149
|
catch error in onComplete for fineuploader
|
2015-09-04 15:54:49 +02:00 |
|
vrde
|
4a4d4ac737
|
Add support for long file names
|
2015-09-03 16:19:02 +02:00 |
|
Cevo
|
5265332901
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-03 15:53:22 +02:00 |
|
Cevo
|
d2f8b658af
|
contract listing being done
|
2015-09-03 15:53:02 +02:00 |
|
diminator
|
9334251fd3
|
notifications on piece details (www, ikono, cyland) and edition details
|
2015-09-03 15:17:12 +02:00 |
|
diminator
|
edcd8e57a4
|
notification app
notification refactor in onion - split by piece/edition
|
2015-09-03 14:15:00 +02:00 |
|
vrde
|
2f5c70eceb
|
Remove unused ButtonSubmitOrClose and styles
|
2015-09-02 17:36:01 +02:00 |
|
diminator
|
7f39c62130
|
create contract and agreement
|
2015-09-02 16:34:43 +02:00 |
|
diminator
|
2450dce642
|
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-02 16:34:28 +02:00 |
|
Tim Daubenschütz
|
a8610fa108
|
change ikono contract
|
2015-09-02 15:56:27 +02:00 |
|
diminator
|
19726560ba
|
bitbucket test
|
2015-09-02 14:39:32 +02:00 |
|
Cevo
|
6555c02f23
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-02 14:03:02 +02:00 |
|
Cevo
|
aa3c188509
|
contract list add
|
2015-09-02 14:02:23 +02:00 |
|
diminator
|
07ce180ff7
|
contract form POST
|
2015-09-02 13:57:41 +02:00 |
|
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
|
bf5d1de635
|
update notification on request action
|
2015-09-01 19:14:48 +02:00 |
|
diminator
|
71c438ee59
|
close notifications dropdown after click
|
2015-09-01 18:38:24 +02:00 |
|
diminator
|
7919521578
|
refactor of notifications
|
2015-09-01 18:11:18 +02:00 |
|
Tim Daubenschütz
|
9d7b5cbe2a
|
advance create contract form
|
2015-09-01 16:57:12 +02:00 |
|
diminator
|
bfaf4886a4
|
notifications unoptimized
|
2015-09-01 14:45:14 +02:00 |
|
Tim Daubenschütz
|
b4abe7a245
|
generic form submission determination for fineuploader
|
2015-09-01 14:42:09 +02:00 |
|
Tim Daubenschütz
|
b5b1e36109
|
nested collapsible paragraphs
|
2015-09-01 14:00:06 +02:00 |
|
Tim Daubenschütz
|
56cdcdb5c6
|
Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-01 13:30:04 +02:00 |
|
TimDaubenschuetz
|
c33976ad37
|
Merged in AD-875-slidecontainer-add-vendor-prefixe (pull request #41)
add vendor prefixes for slide container
|
2015-09-01 09:49:57 +02:00 |
|
Tim Daubenschütz
|
f83300e597
|
incorporate pr feedback
|
2015-09-01 09:34:29 +02:00 |
|
Tim Daubenschütz
|
af7938dbc7
|
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-01 09:29:58 +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 |
|
Tim Daubenschütz
|
96fdb598f7
|
change api endpoints to contractblobs
|
2015-08-31 17:29:43 +02:00 |
|
Tim Daubenschütz
|
55948bc9ba
|
integrate unfilteredPieceListCount into piece list store and list
|
2015-08-31 16:57:16 +02:00 |
|
Tim Daubenschütz
|
7e1815bb1f
|
refactor account settings into multiple files
|
2015-08-31 16:36:24 +02:00 |
|
Tim Daubenschütz
|
ea52927eec
|
rename uploading routes
|
2015-08-31 11:33:44 +02:00 |
|
Tim Daubenschütz
|
90f89e4498
|
other loan contract to contract renaming
|
2015-08-31 11:05:33 +02:00 |
|
vrde
|
3f34fc680e
|
Get rid of ascribe-btn-gray
|
2015-08-28 16:40:54 +02:00 |
|
diminator
|
9dddf0bf21
|
Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col
|
2015-08-28 16:25:57 +02:00 |
|
Tim Daubenschütz
|
dd20afff90
|
rename LoanContract to Contract
|
2015-08-28 16:18:10 +02:00 |
|
Tim Daubenschütz
|
d9f3f2a9d7
|
rename contract_form to form_contract
|
2015-08-28 15:55:39 +02:00 |
|
Tim Daubenschütz
|
02ed21fef5
|
fix nav links on logged out user
|
2015-08-28 15:31:12 +02:00 |
|
Tim Daubenschütz
|
848321a3f3
|
fix nav links on logged out user
|
2015-08-28 15:29:30 +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
|
ddfc8b9621
|
minor fixes
|
2015-08-28 14:27:02 +02:00 |
|
Tim Daubenschütz
|
8e7aeab3a6
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-08-28 14:08:45 +02:00 |
|
Tim Daubenschütz
|
52ae348e57
|
dynamic acl for acl_submit
|
2015-08-28 14:07:29 +02:00 |
|
diminator
|
02e105d2b8
|
text refactor
|
2015-08-28 14:00:50 +02:00 |
|
diminator
|
1b730573c7
|
ikonotv acl_submitted + refactor
|
2015-08-28 13:58:24 +02:00 |
|
diminator
|
680cc8572f
|
ikonotv acl_submit
|
2015-08-28 13:52:58 +02:00 |
|
Tim Daubenschütz
|
d40b671b45
|
remove ikonotv boilerplate landing page
|
2015-08-28 12:48:48 +02:00 |
|
Tim Daubenschütz
|
8eec5d8f38
|
Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-28 12:44:02 +02:00 |
|
Tim Daubenschütz
|
5219dd5cf7
|
fix bug + enable contract
|
2015-08-28 12:40:00 +02:00 |
|
Tim Daubenschütz
|
e9d0311f58
|
custom ikonotv piece page
|
2015-08-28 12:33:00 +02:00 |
|
Tim Daubenschütz
|
2c26aab8cc
|
add exception for loaning a piece for ikonotv
|
2015-08-28 12:20:36 +02:00 |
|
Tim Daubenschütz
|
89f68abcec
|
add: Loan form for Ikonotv
|
2015-08-28 12:11:29 +02:00 |
|
Tim Daubenschütz
|
9a9aa68ca9
|
fix lazy evalutaion of loan form
|
2015-08-28 11:13:28 +02:00 |
|
Tim Daubenschütz
|
8e5c04140f
|
add vendor prefixes for slide container
|
2015-08-27 18:11:47 +02:00 |
|
Tim Daubenschütz
|
86efb66663
|
add collapsible appendix to send contract form
|
2015-08-27 17:33:51 +02:00 |
|
Tim Daubenschütz
|
65148e24de
|
remove contract form from ikonotv codebase and integrate it into ascribe-core
|
2015-08-27 14:56:49 +02:00 |
|
Tim Daubenschütz
|
64d23f82df
|
refactoring of the general architecture
|
2015-08-27 14:47:33 +02:00 |
|
Tim Daubenschütz
|
9d7a9bd028
|
add router/navigation integration into whole project
|
2015-08-27 14:34:15 +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
|
4b2f48bc50
|
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-27 13:48:33 +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
|
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 |
|
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 |
|
Tim Daubenschütz
|
cd49a9c402
|
Create generic links in nav using routes
|
2015-08-25 16:33:26 +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
|
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 |
|
Tim Daubenschütz
|
4dcd66c05b
|
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
|
2015-08-21 16:14:58 +02:00 |
|
Tim Daubenschütz
|
284919f3db
|
fix bug
|
2015-08-21 16:14:15 +02:00 |
|
diminator
|
edec430109
|
public and private note in edition and piece
connection in frontend
|
2015-08-21 15:04:38 +02:00 |
|
Tim Daubenschütz
|
116cb9c2fc
|
fix disappearing fineuploader in additional data
|
2015-08-21 14:07:10 +02:00 |
|
Tim Daubenschütz
|
5acce27df2
|
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
|
2015-08-21 11:35:00 +02:00 |
|
Tim Daubenschütz
|
09c0451c86
|
Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
|
2015-08-21 11:34:47 +02:00 |
|
Tim Daubenschütz
|
e0b2f352df
|
fix locked fields
|
2015-08-21 11:29:57 +02:00 |
|
Tim Daubenschütz
|
3b46dbb9f5
|
add upload busy function to fineuploader
|
2015-08-21 11:11:31 +02:00 |
|
Tim Daubenschütz
|
30d57a943f
|
fix lock form
|
2015-08-21 11:01:13 +02:00 |
|
diminator
|
433703a470
|
moved terms
|
2015-08-21 10:54:57 +02:00 |
|
diminator
|
5c6b753acb
|
piece loan history
|
2015-08-20 15:50:30 +02:00 |
|
diminator
|
60db83c626
|
cyland detail subheader
|
2015-08-20 14:18:01 +02:00 |
|
diminator
|
ffdb4847db
|
piece bitcoin id
|
2015-08-20 14:01:02 +02:00 |
|
diminator
|
7afb3d68b8
|
Merge remote-tracking branch 'remotes/origin/AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
|
2015-08-20 11:32:27 +02:00 |
|
diminator
|
5b2ab6c1e2
|
bug fix acls
otherdata frontend
MIGRATE + loaddate whitelabel
|
2015-08-20 11:32:11 +02:00 |
|
Tim Daubenschütz
|
5d4762f942
|
fix lock functionality bug
|
2015-08-20 11:03:00 +02:00 |
|
diminator
|
1f1a8b7761
|
bug fix piece loan acl
bug fix piece edit acl
DOUBLE MIGRATE
|
2015-08-19 19:12:30 +02:00 |
|
Tim Daubenschütz
|
12de8139c2
|
separate breadcrumb functionality into own component
|
2015-08-19 18:36:23 +02:00 |
|
Tim Daubenschütz
|
689796b115
|
slidecontainer: display lock on progress
|
2015-08-19 18:23:04 +02:00 |
|
Tim Daubenschütz
|
215f251845
|
enable overriding of editable prop for property
|
2015-08-19 18:09:37 +02:00 |
|
Tim Daubenschütz
|
495f5600af
|
implement form locking for cyland
|
2015-08-19 17:39:25 +02:00 |
|
diminator
|
7e9e187c18
|
bug fix breadcrumbs
bug fix sluice landing page
bug fix sluice register_piece
bug fix ownershiphistory pending
|
2015-08-19 17:18:32 +02:00 |
|
Tim Daubenschütz
|
862cd7986c
|
add lock/disabled functionality to form
|
2015-08-19 17:06:14 +02:00 |
|
diminator
|
b66fdc332d
|
Merge branch 'tmp2' into AD-613-cyland-white-label-page
|
2015-08-19 16:46:07 +02:00 |
|
Tim Daubenschütz
|
d5e8181855
|
make cyland submission stateful
|
2015-08-19 16:02:10 +02:00 |
|
Tim Daubenschütz
|
0b4b3fa727
|
fix slideContainer broken functionality
|
2015-08-19 15:54:13 +02:00 |
|
Tim Daubenschütz
|
8a88f978c6
|
add start_from parameter to slide container
|
2015-08-19 15:30:48 +02:00 |
|
diminator
|
b1703b6284
|
cyland landing
|
2015-08-19 14:48:22 +02:00 |
|
Tim Daubenschütz
|
406cee5bd3
|
refactor breadcrumbs to attributes
|
2015-08-19 14:11:03 +02:00 |
|
diminator
|
6d8d318e8d
|
Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-19 13:58:55 +02:00 |
|
Tim Daubenschütz
|
6dab66ec61
|
restructure cyland submit button
|
2015-08-19 13:56:43 +02:00 |
|
diminator
|
b7e81fb0dd
|
cyland landing
|
2015-08-19 13:54:45 +02:00 |
|
diminator
|
188cca4834
|
ikono register
|
2015-08-19 09:31:36 +02:00 |
|
diminator
|
e933b334c2
|
loan contract form
|
2015-08-18 16:24:36 +02:00 |
|
Tim Daubenschütz
|
e88612704f
|
cyland loan form for accordion list
|
2015-08-18 13:39:06 +02:00 |
|
Tim Daubenschütz
|
ad8be7e34a
|
separate pre-sending form submission functionality
|
2015-08-18 13:15:22 +02:00 |
|
diminator
|
e862fa39a9
|
Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
web/settings.py
|
2015-08-18 12:36:38 +02:00 |
|
diminator
|
8ae7edaa1c
|
ikonotv initial setup
|
2015-08-18 12:08:01 +02:00 |
|
Tim Daubenschütz
|
eb54e6fff6
|
refresh piece list after loan
|
2015-08-18 10:53:50 +02:00 |
|
Tim Daubenschütz
|
6a0a1b1e35
|
Merge branch 'AD-777-fineuploader-needs-to-support-mul' into AD-613-cyland-white-label-page
|
2015-08-18 10:45:57 +02:00 |
|
diminator
|
f77f1d1d5d
|
cyland submit button and form WIP
cyland footers
|
2015-08-18 09:42:28 +02:00 |
|
diminator
|
fc82c866fb
|
cyland refactor
whitelabel + cyland app
|
2015-08-17 20:52:36 +02:00 |
|
diminator
|
0be3e249bb
|
breadcrumb style fix
|
2015-08-17 13:46:04 +02:00 |
|
diminator
|
cf86e352e4
|
slide breadcrumbs
|
2015-08-17 12:18:40 +02:00 |
|
diminator
|
12dde0458c
|
Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page
|
2015-08-17 09:56:55 +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
|
d24b325062
|
bug fix loadPiece
|
2015-08-13 14:16:44 +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 |
|
Tim Daubenschütz
|
88423e6757
|
fix scroll overflow
|
2015-08-12 16:26:24 +02:00 |
|
Tim Daubenschütz
|
0cf5815f42
|
add functionality to make a forwarded process slide container
|
2015-08-12 16:11:15 +02:00 |
|
Tim Daubenschütz
|
d3bf990ca5
|
adjust props
|
2015-08-12 14:40:44 +02:00 |
|
Tim Daubenschütz
|
1620437c86
|
add defaultValue to inputdate
|
2015-08-12 13:53:17 +02:00 |
|
Tim Daubenschütz
|
d5dc164810
|
boilerplate for loan process
|
2015-08-12 13:34:41 +02:00 |
|
diminator
|
c25de71b4b
|
notes and bug fixes
|
2015-08-12 13:21:05 +02:00 |
|
Tim Daubenschütz
|
9630d043db
|
first slide cyland archive submission
|
2015-08-12 09:52:51 +02:00 |
|
Tim Daubenschütz
|
8612f73e96
|
separate cc register form
|
2015-08-12 09:30:24 +02:00 |
|
Tim Daubenschütz
|
ac45283968
|
first iteration: whitelabel pages depending on customer
|
2015-08-11 17:40:26 +02:00 |
|
diminator
|
22727c2703
|
refactored piece container and detail
|
2015-08-11 17:12:12 +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
|
f086bece71
|
add boilerplate code for wallet application
|
2015-08-11 13:10:15 +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 |
|
Tim Daubenschütz
|
95e0b256b6
|
Merge branch 'master' into AD-613-cyland-white-label-page
Conflicts:
.gitignore
|
2015-08-11 11:50:09 +02:00 |
|
Tim Daubenschütz
|
0cf63fa6c8
|
fix synchronization of files of fineuploader
|
2015-08-11 11:39:58 +02:00 |
|
Tim Daubenschütz
|
58c0ce4c3f
|
fix wording for multiple uploads
|
2015-08-11 10:03:12 +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
|
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
|
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 |
|
Tim Daubenschütz
|
6fc7ac8b63
|
remove unneccesary action for edition list actions
|
2015-08-07 13:21:54 +02:00 |
|
Tim Daubenschütz
|
bbb0bb15b6
|
add documentation
|
2015-08-07 13:20:31 +02:00 |
|
Tim Daubenschütz
|
ada7df25a7
|
fix minor consistence bug
|
2015-08-07 13:18:33 +02:00 |
|
Tim Daubenschütz
|
b5448b0acb
|
wording
|
2015-08-07 13:09:57 +02:00 |
|
Tim Daubenschütz
|
192f776bd8
|
Filter open edition tables correctly
|
2015-08-07 13:05:50 +02:00 |
|
diminator
|
aba30acb02
|
Merge remote-tracking branch 'origin/master'
|
2015-08-07 11:28:17 +02:00 |
|
diminator
|
67f70357a5
|
jury invitation, revoke, resend
MIGRATE!
|
2015-08-07 11:27:44 +02:00 |
|
Tim Daubenschütz
|
158f91f3f2
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-08-06 15:15:19 +02:00 |
|
Tim Daubenschütz
|
dfbc7b75fe
|
fix loan form
|
2015-08-06 15:14:50 +02:00 |
|
diminator
|
2d4f307dcb
|
Merge remote-tracking branch 'origin/AD-544-automatically-share-registered-pr' into AD-544-automatically-share-registered-pr
|
2015-08-06 13:56:57 +02:00 |
|
diminator
|
99ea0e1af8
|
action-panel WIP
|
2015-08-06 13:56:37 +02:00 |
|
Tim Daubenschütz
|
e227db1b3b
|
fix create editions for filter widget
|
2015-08-06 13:43:53 +02:00 |
|
Tim Daubenschütz
|
ee97e600ef
|
fix bug in piece list filter widget
|
2015-08-06 13:15:52 +02:00 |
|