ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,624 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

455 Commits

Author SHA1 Message Date
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
Tim Daubenschütz 18898b6f8a start working on register piece for price - WIP 2015-07-14 20:07:55 +02:00
Tim Daubenschütz 49b530870d fix overflow issue 2015-07-14 19:03:10 +02:00
Tim Daubenschütz 97f8d416af styling again 2015-07-14 18:55:34 +02:00
Tim Daubenschütz e49b920318 more styling on the landing page 2015-07-14 18:34:46 +02:00
Tim Daubenschütz ff64734545 styling 2015-07-14 17:41:57 +02:00
diminator e0eb31d1de transfer + withdraw 2015-07-14 11:42:09 +02:00
vrde b4f1d3d6cc Merge branch 'master' into AD-565-add-landing-page-for-sluice 
Conflicts:
	js/components/login_container.js
 2015-07-13 17:19:23 +02:00
vrde 3878dc12da Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 16:35:49 +02:00
Tim Daubenschütz 733c95a070 loading feedback for piece and edition page 2015-07-13 15:21:09 +02:00
Tim Daubenschütz 3ae10c5e50 first cut loading spinner pieces 2015-07-13 15:00:12 +02:00
vrde 3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
Tim Daubenschütz b51a03ce9c styling changes 2015-07-13 14:19:22 +02:00
diminator a07bc9e0e2 piece + share 
acl first cut
 2015-07-13 14:10:46 +02:00
Tim Daubenschütz 5011304939 fix spool color 2015-07-13 10:11:25 +02:00
diminator e282da8474 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 17:52:39 +02:00
Tim Daubenschütz e55bc239b4 refactor signup form 2015-07-10 16:04:57 +02:00
Tim Daubenschütz b364414e16 input checkbox functionality 2015-07-10 15:56:54 +02:00
diminator 8679a2446d Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 2015-07-10 14:49:19 +02:00
Tim Daubenschütz 75590dbb34 fix position of spinner in fine uploader 2015-07-10 14:34:14 +02:00
Tim Daubenschütz 1df068d75f add edition creation functionality 2015-07-10 13:54:25 +02:00
diminator 6a84e9d36e whitelabel logo + sluice 2015-07-10 11:59:03 +02:00
diminator 22b201f388 register piece returns to piece detail 2015-07-10 10:30:17 +02:00
diminator 5855b163a8 Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from- 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item.js
 2015-07-10 10:29:59 +02:00
diminator 8f78de3fb4 editions styling 
fix otherdata
collapsible styling
 2015-07-09 18:46:53 +01:00
Tim Daubenschütz 5f459aa139 add dynamic links to piece list item depending on wether editions exist or not 2015-07-09 17:28:21 +02:00
diminator 05a63f28e9 editions layout 2015-07-09 15:53:10 +01:00
diminator cde77bf944 editions layout 2015-07-09 15:29:10 +01:00
Tim Daubenschütz 773cab6505 remove piece list edition table toggle and put it inside of accordion list item 2015-07-09 14:04:48 +02:00
Tim Daubenschütz 35a287b8a1 made edition registration optional 2015-07-09 11:56:54 +02:00
Tim Daubenschütz 59f131f788 add desktop version for notifications 2015-07-08 17:06:53 +02:00
Tim Daubenschütz 5e14ea6f87 refactor globalnotification 2015-07-08 15:40:32 +02:00
Tim Daubenschütz c945fc315b various visual changes 2015-07-08 14:37:20 +02:00
Tim Daubenschütz 85d7399041 align checkboxes on table 2015-07-08 11:29:48 +02:00
Tim Daubenschütz 27ae405d5d increase font size for editions table 2015-07-08 11:15:22 +02:00
Tim Daubenschütz c1e50cbe78 visual edits to fineuploader 2015-07-08 10:03:06 +02:00
Tim Daubenschütz 22629ac09d adjust register piece form 2015-07-07 18:07:12 +02:00
diminator b9e8aae298 Merge remote-tracking branch 'remotes/origin/AD-475-loading-feedback-for-all-views' 
Conflicts:
	sass/ascribe_piece_list_toolbar.scss
 2015-07-07 10:34:40 +02:00
diminator 787d48ad11 Merge remote-tracking branch 'origin/master' 2015-07-07 10:28:59 +02:00
diminator fa2ae7cba8 styling changes for frontend 2015-07-07 10:28:39 +02:00
Tim Daubenschütz ae9e2e6a28 if user has piece with one edition, do not display show editions 2015-07-07 09:31:56 +02:00
Tim Daubenschütz d5fad09b60 loading animation for show more 2015-07-06 18:29:27 +02:00
diminator 531505c0d1 Merge remote-tracking branch 'remotes/origin/AD-506-add-audio-player' 2015-07-02 18:35:04 +02:00
vrde c2c0fd3ab8 Add audio player 2015-07-02 18:27:09 +02:00
vrde 7f8a36b99a Add videojs and styles 2015-07-02 17:10:32 +02:00
Tim Daubenschütz 24af321669 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- 2015-07-02 16:51:43 +02:00
diminator 41da3b2029 footer + social icons 2015-07-02 15:41:17 +02:00
diminator 3556e8c3c2 ellipsis 2015-07-02 14:40:04 +02:00
diminator 0391b99f1f styling of accordeon-list items 2015-07-02 14:12:54 +02:00
Tim Daubenschütz 4b87d21259 add working slides container boilerplate 2015-07-02 13:31:35 +02:00
Tim Daubenschütz 1f6d20fb15 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user- 
Conflicts:
	js/components/register_piece.js
 2015-07-02 11:50:39 +02:00
Tim Daubenschütz e542d3b2a5 piece registration animation process 2015-07-02 11:49:17 +02:00
diminator 4ca2144c0c request actions in frontend 2015-07-01 19:05:47 +02:00
diminator 5f372eedda edition_index + default license 2015-07-01 15:28:48 +02:00
diminator 1ec47338a1 deleted editions cannot be retrieved 2015-07-01 12:17:50 +02:00
diminator f58a65eb0c s3 views dont accept anonymous 2015-07-01 11:43:33 +02:00
diminator ca3b058b4d Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 2015-07-01 11:22:49 +02:00
diminator 3e71926b7d register piece transitions 2015-07-01 11:21:43 +02:00
Tim Daubenschütz 77093cb23f fix minor table bug 2015-07-01 10:54:51 +02:00
Tim Daubenschütz d67bbe7770 made accordion table responsive 2015-07-01 10:53:40 +02:00
Tim Daubenschütz 3cd14418e7 fix piece list bulk modal scaling 2015-07-01 10:10:57 +02:00
Tim Daubenschütz 1db9921dd8 use safe urls for thumbnails and links 2015-07-01 10:00:53 +02:00
diminator 2436e198db styling + licenses url 2015-07-01 09:15:36 +02:00
Tim Daubenschütz 929c694ad7 finalized delete functionality 2015-06-30 17:57:20 +02:00
Tim Daubenschütz 26442c9230 add margins to button lists 2015-06-30 17:12:13 +02:00
Tim Daubenschütz 2a5bd9173e fix image scaling 2015-06-30 16:53:22 +02:00
Tim Daubenschütz a4bf38085c style pager buttons 2015-06-30 16:24:41 +02:00
Tim Daubenschütz e31b6f0108 Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload 
Conflicts:
	js/components/register_piece.js
 2015-06-30 10:45:07 +02:00
diminator 8fc400bb01 licenses in registration 2015-06-30 10:42:58 +02:00
Tim Daubenschütz 52db729a4d readd delete functionality 2015-06-29 17:59:35 +02:00
Tim Daubenschütz e44ae60b75 first cut pause 2015-06-29 16:46:12 +02:00
diminator e36681ad4d Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib 
Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-06-29 16:15:08 +02:00
diminator f3677501c1 whitelabel subdomains 2015-06-29 15:58:47 +02:00
Tim Daubenschütz dcb3e00e3a styling for mobile 2015-06-29 14:36:55 +02:00
Tim Daubenschütz 867ebec134 fix styling for fineuploader 2015-06-29 13:41:37 +02:00
diminator 2c2ccd7891 Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend 2015-06-26 11:52:59 +02:00
diminator 930982873a Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend 2015-06-26 00:04:25 +02:00
diminator b1ad4cc36f withdraw transfer part one 2015-06-25 23:25:03 +02:00
diminator fba30a565b coa renders per page 
verify
 2015-06-25 14:39:39 +02:00
Tim Daubenschütz 08f574a42b finish delete functionality 2015-06-25 14:15:02 +02:00
Tim Daubenschütz b7e933c943 add delete buttons 2015-06-25 13:28:49 +02:00
Tim Daubenschütz 845f8c9cd3 fix issues related to multiple files upload 2015-06-25 11:12:40 +02:00
Tim Daubenschütz ea88e87355 Merge branch 'AD-416-account-settings-page-navbar' of bitbucket.org:ascribe/onion into AD-416-account-settings-page-navbar 
Conflicts:
	sass/main.scss
 2015-06-24 15:50:45 +02:00
ddejongh 41d70a9a15 Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar 
Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss
 2015-06-23 16:07:17 +02:00
ddejongh 95f6c08706 localization 2015-06-23 16:02:48 +02:00
ddejongh 6dd3e582df fineuploader + register 2015-06-23 13:55:05 +02:00
ddejongh 3f3e9a273f git removed s3-fineuploader 2015-06-23 10:27:19 +02:00
ddejongh c8cb456709 Removed submodule react-s3 2015-06-23 10:16:53 +02:00
ddejongh 89884ced1f edition detail updated with forms 2015-06-22 23:32:41 +02:00
ddejongh 02f8193743 style tweaks 2015-06-22 18:02:04 +02:00
ddejongh 9e1a76a08e api settings complete 2015-06-22 17:33:25 +02:00
Tim Daubenschütz cb3349c416 Merge branch 'AD-416-account-settings-page-navbar' of bitbucket.org:ascribe/onion into AD-416-account-settings-page-navbar 2015-06-22 10:55:43 +02:00
ddejongh f836d4c2d4 register first cut 2015-06-22 10:50:22 +02:00
ddejongh 23190f6c48 signup/login 2015-06-20 16:43:18 +02:00
Tim Daubenschütz 2b861c4773 copy fineuploader theme 2015-06-19 13:17:40 +02:00
ddejongh efc7f6d46b Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar 
Conflicts:
	js/routes.js
 2015-06-19 13:13:37 +02:00
ddejongh c2d8b78136 settings 2015-06-18 19:03:03 +02:00
Tim Daubenschütz 3a8efb3dd6 Dimi and Tim styling action 2015-06-17 19:50:52 +02:00
Tim Daubenschütz e2997891df loading icon for piece list 2015-06-16 09:57:14 +02:00
Tim Daubenschütz 7910384d99 solve merge conflicts 2015-06-16 09:02:48 +02:00
Tim Daubenschütz d41f5df3ee separat ascribe-table css 2015-06-12 15:42:43 +02:00
Tim Daubenschütz 87bc6b3559 fix checkbox in edition list 2015-06-12 13:41:15 +02:00
Tim Daubenschütz dcd770ab5f readd sourcemaps 2015-06-12 13:36:55 +02:00
vrde b9c8002495 Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
vrde 5445698eea [wip] add temporary base url 2015-06-09 16:10:25 +02:00
ddejongh 30ee436f4c Merge remote-tracking branch 'remotes/origin/master' into AD-43-in-piece_detail-add-generic-field- 
Conflicts:
	gulpfile.js

added notifications
cleaned up proptypes
 2015-06-09 16:09:59 +02:00
Tim Daubenschütz 669f2b3ae7 resolve merge conflict 2015-06-09 13:38:01 +02:00
ddejongh 6563bf97b0 toggable textarea 2015-06-09 13:29:22 +02:00
Tim Daubenschütz e0e75151e0 add first working prototype 2015-06-08 18:14:25 +02:00
vrde a1bfbb8f86 [wip] add server to serve app 2015-06-08 15:24:58 +02:00
Tim Daubenschütz 443829320f add personal note to piece detail page 2015-06-05 16:20:28 +02:00
Tim Daubenschütz 7f82d49278 resolve merge 2015-06-05 14:29:37 +02:00
Tim Daubenschütz 76a41a23b9 add details to piece detail page 2015-06-05 14:22:02 +02:00
vrde e8627cd0a3 Merge branch 'master' into AD-412-mediaplayer 
Conflicts:
	js/components/ascribe_media/resource_viewer.js
	js/components/edition_container.js
	js/mixins/inject_in_head_mixin.js
	package.json
 2015-06-05 13:18:16 +02:00
Tim Daubenschütz a7478cdcb5 resolve merge conflicts 2015-06-05 11:40:49 +02:00
vrde 8f65aa7a2d Add "other" type display 2015-06-04 17:37:46 +02:00
Tim Daubenschütz 6f73f1ebfd refactor table to bootstrap table 2015-06-04 17:21:38 +02:00
vrde 13caad7794 Refactor and restyle 2015-06-04 16:15:59 +02:00
Tim Daubenschütz eaefd253d5 fixing AD-393 2015-06-04 16:13:10 +02:00
Tim Daubenschütz 4fd5cdcdb5 add real href to edition list 2015-06-04 16:07:37 +02:00
Tim Daubenschütz a93634f010 add transition model and callback for closing the edition list of a piece after changing route 2015-06-04 13:48:07 +02:00
Tim Daubenschütz 8d560fb664 thumbnail is not croped anymore 2015-06-03 16:48:31 +02:00
Tim Daubenschütz e3c3afcefa add year to accordion-list-item 2015-06-03 16:34:32 +02:00
ddejongh 876ade5f12 collapse part 1 2015-06-03 11:56:49 +02:00
Tim Daubenschütz b4076aeef7 code styling 2015-06-03 10:45:23 +02:00
ddejongh a51c27fb9f loan form styled, 
overlay styled
 2015-06-02 18:43:37 +02:00
Tim Daubenschütz 95c199bed6 resolve cluster-merge-fuck 2015-06-02 17:32:38 +02:00
vrde 141d21155b WIP to style widgets, will continue later 2015-06-02 13:44:50 +02:00
Tim Daubenschütz 713dd72b2b add unfinished filtering widget 2015-06-02 11:40:55 +02:00
Tim Daubenschütz eb5d6f6cc3 implement search functionality 2015-06-02 10:10:09 +02:00
Tim Daubenschütz c2c2049229 rename piece_list_toolbar to a more fitting name: piece_list_bulk_modal 2015-06-02 09:10:26 +02:00
ddejongh 3f9f133224 Merge remote-tracking branches 'remotes/origin/AD-51-refactor-table-to-mockup' and 'remotes/origin/piece-detail-mediaplayer' into piece-detail-setup 2015-06-01 15:58:37 +02:00
Tim Daubenschütz 8a18d894cc add clear selection functionality 2015-06-01 15:12:31 +02:00
Tim Daubenschütz f653564b51 implement toggle functionality 2015-06-01 13:18:24 +02:00
ddejongh d90a4f97db loan 2015-06-01 13:02:53 +02:00
Tim Daubenschütz ade6ab7f26 integrate table component into accordion list 2015-06-01 11:51:03 +02:00