Cevo
b4b05b3161
information added to forms and delete form title changed, acl information component created, information text is added to the constants
2015-10-13 18:33:08 +02:00
diminator
0a07106ae8
ikonotv styling
2015-10-13 13:32:48 +02:00
diminator
24011b773b
merge header - form error
2015-10-13 11:39:42 +02:00
diminator
8d970a65c4
spinners in forms
...
button wide
2015-10-12 17:55:02 +02:00
diminator
aa7c4a57e5
refactored property from settings
2015-10-12 15:34:06 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +02:00
diminator
790bf595d9
glyphs, spinner, piece list/edition table
2015-10-09 16:21:26 +02:00
diminator
dc8599830b
updated glyphs, accordion pieces ok
2015-10-09 13:14:29 +02:00
diminator
85d3184e98
piece list styling
2015-10-09 02:00:02 +02:00
diminator
b7aaa9a4cf
collection page + footer
2015-10-08 20:26:29 +02:00
diminator
71988d502d
ascribe fonts
...
first cut layout
spinner
2015-10-08 11:12:15 +02:00
vrde
7a47cf0bfe
WIP, preparing styles for the new corporate identity
2015-09-30 18:58:21 +02:00
Tim Daubenschütz
99d29449a3
style 404 page
2015-09-30 10:44:38 +02:00
Cevo
7b9424ca68
merging from master and resolving the conflicts in main.scss, master overrides
2015-09-29 11:59:18 +02:00
Cevo
b6cfafc917
unused css class removed
2015-09-29 11:04:20 +02:00
Tim Daubenschütz
df338ac746
Fix alignment for AclInformationButton
2015-09-29 10:31:13 +02:00
Cevo
661cb44b94
reached the spec with dirty tricks
2015-09-28 22:09:25 +02:00
Tim Daubenschütz
6a5b66bda5
fix alignment of download button and file type in fineuploader
2015-09-28 17:25:45 +02:00
Tim Daubenschütz
cb9acf71f4
Contract settings: break contract name on any character
2015-09-28 15:35:35 +02:00
Tim Daubenschütz
5b9d7eae65
Corrections on loan form
2015-09-28 15:14:45 +02:00
Tim Daubenschütz
40777cfeae
Center dialog text for hashing files in file_drag_and_drop
2015-09-28 10:07:17 +02:00
Tim Daubenschütz
cfab59c027
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-25 16:23:22 +02:00
Tim Daubenschütz
f2b4c23bd7
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
js/routes.js
2015-09-25 16:23:01 +02:00
Tim Daubenschütz
9080c84fa9
Implement word wrap for ContractSettings
2015-09-25 11:20:12 +02:00
vrde
6fd01b12a5
Fix mobile menu
2015-09-23 16:27:32 +02:00
TimDaubenschuetz
93e61cfff5
Merged in AD-943-add-custom-additional-fields (pull request #60 )
...
Ad 943 add custom additional fields
2015-09-23 14:16:16 +02:00
TimDaubenschuetz
6e09d5bc16
Merged in AD-1049-fix-form-borders (pull request #78 )
...
Fix form borders
2015-09-22 17:21:12 +02:00
vrde
172b5b7c5b
Fix form borders
2015-09-22 17:11:38 +02:00
Tim Daubenschütz
1320b5c965
cleanup form_loan and contract_agreement_list_actions
2015-09-22 16:45:24 +02:00
TimDaubenschuetz
dfc75824de
Merged in AD-1045-revamp-flashy-landing-page (pull request #76 )
...
Landing now iterates over colors
2015-09-22 15:18:19 +02:00
TimDaubenschuetz
30f2d75cb4
Merged in AD-1032-style-progress-and-notifications (pull request #74 )
...
Add style for notification
2015-09-22 15:17:46 +02:00
vrde
259f4b10e3
Style progress bar
2015-09-22 15:13:48 +02:00
vrde
69f0753fc7
Fix color for "open" status for .btn-default
2015-09-22 15:02:36 +02:00
vrde
1885440447
Landing now iterates over colors
2015-09-22 14:46:32 +02:00
vrde
d4f637aa8a
Add color for disabled buttons
2015-09-22 13:44:19 +02:00
Tim Daubenschütz
bd5aa266b1
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-22 13:38:31 +02:00
vrde
c7321359c9
Add style for notification
2015-09-22 13:37:31 +02:00
Tim Daubenschütz
a0ff5af62b
Make style changes
2015-09-22 11:33:59 +02:00
vrde
865c21557c
Add style for buttons
2015-09-21 16:23:18 +02:00
vrde
d0c46d4ca2
Fix hover/focus status on hambuger icon
2015-09-21 14:58:07 +02:00
vrde
9444cfb1bf
Add styles for header
2015-09-21 14:53:58 +02:00
vrde
dd965653d6
Add style to loading button
2015-09-18 16:00:39 +02:00
vrde
7be3c8b469
Add style for signup and login
2015-09-18 15:36:01 +02:00
TimDaubenschuetz
4f55c63cf5
Merged in AD-997-prepare-landing-page (pull request #67 )
...
Finish styling for landing page
2015-09-18 14:54:11 +02:00
vrde
03803ca61a
Add active routes as css classes
2015-09-18 14:25:31 +02:00
vrde
c99c3492fb
Add margin top to ascribe-wallet-app class
2015-09-18 14:02:31 +02:00
vrde
b76ffcde73
Finish styling for landing page
2015-09-18 13:46:15 +02:00
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
diminator
e843e2fa52
order by rating
2015-08-14 14:58:23 +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
22727c2703
refactored piece container and detail
2015-08-11 17:12:12 +02:00
Tim Daubenschütz
0cf63fa6c8
fix synchronization of files of fineuploader
2015-08-11 11:39:58 +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
a27415eb86
jury dashboard + rating WIP
2015-08-10 15:23:13 +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
b70eb23dc0
refactor action panel: mostly css and layout
2015-08-10 09:22:39 +02:00
diminator
67f70357a5
jury invitation, revoke, resend
...
MIGRATE!
2015-08-07 11:27:44 +02:00
diminator
99ea0e1af8
action-panel WIP
2015-08-06 13:56:37 +02:00
diminator
36356dd5c5
Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
2015-08-05 14:52:18 +02:00
Tim Daubenschütz
f31d576583
add styling for piece list filter widget
2015-08-04 15:58:39 +02:00
diminator
2258968856
Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
...
Conflicts:
.gitignore
2015-08-04 11:45:20 +02:00
Tim Daubenschütz
e3b46c69a5
implement piece list filter widget functionality
2015-08-04 11:39:33 +02:00
Tim Daubenschütz
7ee296c963
static styling of filter widget
2015-08-04 10:06:02 +02:00
vrde
72821001b7
Merge branch 'AD-601-in-piece_detail-longer-titles-are'
...
Conflicts:
.gitignore
2015-08-03 13:44:53 +02:00
Tim Daubenschütz
d1ed25fe97
ellipsis for artist name in accordion list item
2015-07-30 13:27:05 +02:00
Tim Daubenschütz
2abd3c4a97
search bar padding
2015-07-30 11:56:13 +02:00
Tim Daubenschütz
52f10f178f
Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are
2015-07-30 11:49:48 +02:00
Tim Daubenschütz
88cbf1641c
fix table cell layout
2015-07-29 18:19:24 +02:00
vrde
658f4c36e1
Merge branch 'AD-611-limit-image-size'
2015-07-29 16:04:49 +02:00
vrde
f792c7e045
remove max-height for fullscreen video
2015-07-29 16:04:33 +02:00
vrde
63c57e6725
Merge branch 'AD-611-limit-image-size'
2015-07-29 15:55:01 +02:00
vrde
83ebca2795
Add new constraints for image size
2015-07-29 15:54:08 +02:00
diminator
f4ccd417fc
loan form styling
2015-07-29 14:49:36 +02:00
diminator
deebacd063
Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22 )
...
Ad 601 in piece_detail longer titles are
2015-07-29 14:16:40 +02:00
Tim Daubenschütz
cb5b381e0b
fix scaling issue for slides container
2015-07-29 11:23:25 +02:00
Tim Daubenschütz
ee0c36a73d
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-29 09:35:29 +02:00
Tim Daubenschütz
76cf9fd74d
Merge branch 'AD-435-hash-locally-for-when-a-artist-do'
...
Conflicts:
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_slides_container/slides_container.js
js/components/ascribe_uploader/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-07-29 09:35:14 +02:00
vrde
56b4ee5964
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-28 17:34:51 +02:00
vrde
eee74e26b7
Limit image size
2015-07-28 17:34:15 +02:00
Tim Daubenschütz
22230b0c59
correct scaling for accordion list
2015-07-28 17:19:19 +02:00
Tim Daubenschütz
d72844f29a
fix alignment of elements (minor css)
2015-07-28 17:10:04 +02:00
TimDaubenschuetz
78049b448e
Merged in AD-598-register-action-switches (pull request #14 )
...
Ad 598 register action switches
2015-07-28 16:36:57 +02:00
Tim Daubenschütz
275f6c839e
minor fixes
2015-07-27 18:24:21 +02:00
Tim Daubenschütz
1a1ba8bbb1
add ellipsis again
2015-07-27 18:19:55 +02:00
Tim Daubenschütz
2274efaed7
implement hashing toggle
2015-07-27 14:21:26 +02:00
Tim Daubenschütz
38751ae612
add user interface feedback
2015-07-24 15:13:20 +02:00
TimDaubenschuetz
61077de3de
Merged in AD-591-finetune-build-process (pull request #13 )
...
Ad 591 finetune build process
2015-07-22 15:19:35 +02:00
diminator
e7d85d6eb8
updated thumbnails:
...
- support multiformat
- runs in celery (way faster registration!)
updated s3 url generation:
- anonymous "/DEPLOYMENT/USER_ID_MD5/PIECE_FILE_HASH/CATEGORY/FILENAME.EXT"
- refactored code
!!!!install postgres hstore extension
sudo apt-get install postgresql postgresql-contrib
sudo su - postgres
psql mysite_db -c 'create extension hstore;'
./manage.py migrate
2015-07-21 15:52:58 +02:00
Tim Daubenschütz
23e6cc17b2
make dropzone inactive when user is logged out
2015-07-21 11:09:21 +02:00
Tim Daubenschütz
68dba56a21
refactor some scss variables and include css source map only in debug
2015-07-20 10:52:12 +02:00
Tim Daubenschütz
af42bb8e67
error handling first cut
2015-07-17 15:41:09 +02:00
Tim Daubenschütz
18a37057e5
fix edition id that was breaking viewport on mobile
2015-07-17 10:36:42 +02:00
Tim Daubenschütz
8d37efec40
fix layouting issues for sluice
2015-07-16 13:50:19 +02:00
Tim Daubenschütz
943c7503ea
fix edition creation display bug on piece detail
2015-07-16 11:39:05 +02:00
vrde
9194dc641a
Dunno. Just did what Tim told me. Not my fault if something is going wrong
2015-07-15 21:15:16 +02:00
Tim Daubenschütz
81aeb478b7
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 14:06:03 +02:00
Tim Daubenschütz
795a268184
loan form styling and loan contract store
2015-07-15 14:03:23 +02:00
diminator
c54bbe231f
width styling of forms
2015-07-15 13:20:34 +02:00
diminator
9ba30f0938
acl_unshare false for prize
...
piece prize details
num_submissions
2015-07-15 12:23:02 +02:00
