Tim Daubenschütz
a96aa1005f
Make PieceListToolbar filters generic
2015-09-16 23:36:21 +02:00
Tim Daubenschütz
48508d5756
Implement filter display for piece list
2015-09-16 21:21:30 +02:00
Tim Daubenschütz
5c49fd6f14
implement ikonotv landing page according to mockups
2015-09-16 18:31:46 +02:00
Tim Daubenschütz
f16a012771
Merge remote-tracking branch 'origin/master' into AD-957-custom-upload-button-for-contract
...
Sync with master
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-16 13:45:24 +02:00
Tim Daubenschütz
83b20e6472
First cut: Upload button for contract settings
2015-09-15 16:35:45 +02:00
Cevo
dceb087f20
q
...
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-09-15 14:06:44 +02:00
Cevo
8294016ebb
main.scss edited
2015-09-15 14:04:16 +02:00
Tim Daubenschütz
497a330e1a
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 13:56:31 +02:00
Cevo
6a57a69e29
main.scss edited
2015-09-15 13:53:09 +02:00
Tim Daubenschütz
fbbbd1de89
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
...
Fix merge conflicts
Conflicts:
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-15 13:47:36 +02:00
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
Tim Daubenschütz
24f0d84fbc
finalize contract settings layout
2015-09-14 17:38:26 +02:00
Tim Daubenschütz
f42f4a02f8
Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading
...
Resolve merge conflicts with master for easier PR.
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-14 11:14:02 +02:00
diminator
6013303bd6
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
2015-09-10 17:45:51 +02:00
Tim Daubenschütz
8255c8dc6f
style progress bar
2015-09-09 15:15:54 +02:00
diminator
ecb51ca5e7
added appendix
2015-09-09 14:15:00 +02:00
Tim Daubenschütz
801227cfee
remove react-progress-bar for react-bootstrap progressbar
2015-09-09 14:11:52 +02:00
diminator
9ad713f781
merge 456
2015-09-08 14:42:51 +02:00
Tim Daubenschütz
2c1ad6dc46
fix bug in contract settings and expand actionpanel functionality
2015-09-08 11:19:11 +02:00
Tim Daubenschütz
2c9370e555
restyle contract settings list
2015-09-08 10:03:20 +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
8e98a7bff7
show overall progress
2015-09-04 14:54:39 +02:00
diminator
73ee0753c1
refactored notifications per detail
2015-09-03 17:25:22 +02:00
vrde
4a4d4ac737
Add support for long file names
2015-09-03 16:19: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
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
diminator
bc28f3d8f5
loan request actions for multiple actions
2015-08-27 13:43:26 +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
15bcd4ba14
average rating
...
cyland bug fix
2015-08-25 10:47:38 +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
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
8a88f978c6
add start_from parameter to slide container
2015-08-19 15:30:48 +02:00
diminator
6d8d318e8d
Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra
2015-08-19 13:58:55 +02:00
diminator
e933b334c2
loan contract form
2015-08-18 16:24:36 +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
cf86e352e4
slide breadcrumbs
2015-08-17 12:18:40 +02:00
diminator
5b2e90a03c
sorting acl and styling
2015-08-14 15:38:30 +02:00
