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 |
|