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 56d8268ceb Add remove button for thumbnail creation dialog 2015-11-23 12:31:53 +01:00
Tim Daubenschütz e134db8915 minor layouting optimizations 2015-11-23 11:05:02 +01:00
Tim Daubenschütz 943d62dd8c Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark 2015-11-20 17:59:26 +01:00
Tim Daubenschütz 12b6407cd2 Cleanup fonts 2015-11-20 15:44:09 +01:00
Tim Daubenschütz 46872a9cc5 Add checkmark glyph to project 2015-11-20 15:40:58 +01:00
Tim Daubenschütz efcc24ab96 Make overall upload progress percentage more visible 2015-11-20 15:24:14 +01:00
Tim Daubenschütz 96ad05cef4 Unknot (and maybe reknot) layouting for FileDragAndDrop 2015-11-20 15:02:39 +01:00
Tim Daubenschütz 1cf8ac2f31 Various small changes for FileDragAndDrop 
Changed:
  - If only one file submitted: hide file-specific progress bar + filename extension
  - Fix bug for when uploaded file is deleteable (avoid error)
  - Add checkmark for when file was actually submitted
 2015-11-20 14:30:24 +01:00
Tim Daubenschütz 6d08540d8b Sync thumbnail uploader to digitalWork uploader in RegisterPieceForm 2015-11-19 11:45:29 +01:00
Tim Daubenschütz 2dcd375850 Add functionality for displaying file name upon uploading single file 2015-11-19 10:43:40 +01:00
Tim Daubenschütz 25372a3edf Include PropertyCollapsible's functionality into Property 2015-11-18 16:31:37 +01:00
Tim Daubenschütz 971d42b36d Add file-format-specific call to action for thumbnail generation 2015-11-17 15:46:46 +01:00
Tim Daubenschütz ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark 
Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js
 2015-11-16 16:38:35 +01:00
Tim Daubenschütz 339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality 
Conflicts:
	js/components/ascribe_detail/media_container.js
	js/components/ascribe_media/media_player.js
 2015-11-16 15:54:49 +01:00
Tim Daubenschütz 8b335cfb07 Include feedback from PR 2015-11-13 09:48:22 +01:00
Tim Daubenschütz da09bd8649 Add link to ToS to submission form 2015-11-12 14:48:57 +01:00
Tim Daubenschütz d1b931715d Add spinner to submission for and make submittable on default with providing error messages 2015-11-12 13:21:10 +01:00
Tim Daubenschütz 1a67cd66f5 Add labeling functionality to UploadButton 2015-11-12 13:08:23 +01:00
Tim Daubenschütz b6773549ee Add proper CI colors 2015-11-12 12:04:38 +01:00
Tim Daubenschütz 5b594e9d82 left-align uploader buttons 2015-11-12 11:27:55 +01:00
Tim Daubenschütz 0438f461c2 Implement static feedback for submitted pieces 2015-11-11 16:27:50 +01:00
Tim Daubenschütz ea321a4a77 Finalize submission flow with validation and thumbnail creation 2015-11-10 17:35:57 +01:00
Brett Sun a9f0a46fbd Move social share buttons to left of download button to accommodate for embed button 2015-11-10 10:29:37 +01:00
Brett Sun 8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Tim Daubenschütz 9ae6b10add Finalizing basic submission flow with lazy evaluated form 2015-11-09 17:52:09 +01:00
Tim Daubenschütz 3e22ad1d9d Finalize layouting submission form 2015-11-09 10:35:23 +01:00
Tim Daubenschütz 7721d62319 Create boilerplate code for portfolioreview 2015-11-06 16:52:08 +01:00
Brett Sun 68c1dd9407 Merge with AD1251 2015-11-03 10:48:28 +01:00
Brett Sun d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Cevo 4668a42950 font size increased to 13 2015-10-29 15:44:05 +01:00
Tim Daubenschütz cc8e455a0e Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent 
Change delete button back to old styling
 2015-10-28 15:56:02 +01:00
Tim Daubenschütz 9db85e7191 Change default font color to ascribe-dark-blue 2015-10-27 18:02:52 +01:00
Tim Daubenschütz 9765ed040b Add tertiary button style 2015-10-27 17:15:23 +01:00
Brett Sun c362b960dd Change focused styling of logo to be normal 2015-10-27 16:04:28 +01:00
Brett Sun 7e438dcaf5 Add link to /collection to ascribe branding on navbar 2015-10-27 11:44:40 +01:00
Tim Daubenschütz 1f7addb886 Adding whitelabel colors for AclInformation 2015-10-23 11:34:58 +02:00
Tim Daubenschütz 3bf70628c1 Finalizing behavior of AclInformation 2015-10-23 11:24:26 +02:00
Tim Daubenschütz cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz e8a9cd89a4 Add resizing functionality to AclButtonList and AclInformation 2015-10-23 09:29:17 +02:00
Brett Sun e226477424 Merge with master 2015-10-22 14:18:23 +02:00
Tim Daubenschütz d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-22 13:38:49 +02:00
Tim Daubenschütz e6d6f86d3f Style placeholder according to Woj's mockups 2015-10-22 11:34:51 +02:00
Tim Daubenschütz b2a9eb1c7c Add thumbnail replacement for new logo 2015-10-22 10:39:11 +02:00
Brett Sun 0c51eb374e Add Lumenus specific piece list 2015-10-21 17:37:29 +02:00
Tim Daubenschütz 2b3f33cca0 Change button styles for whitelabel pages 2015-10-21 15:56:30 +02:00
Tim Daubenschütz a9fa60eaf2 Fix buttons for cc 2015-10-21 14:52:25 +02:00
Tim Daubenschütz 61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
Tim Daubenschütz f4b0952806 Add vendor prefixes and resolve leftover PR comments 2015-10-21 11:00:37 +02:00
Tim Daubenschütz ba553455d2 Remove ascribe_scrollbar.scss 2015-10-21 10:56:24 +02:00
Tim Daubenschütz cd1cdfeede Change font-weights, remove gibson from local CSS file and fix glitches 2015-10-21 10:35:11 +02:00
Tim Daubenschütz 8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	package.json
 2015-10-20 18:11:41 +02:00
Tim Daubenschütz beee069d3f Minor layouting fixes 2015-10-20 15:51:22 +02:00
Tim Daubenschütz ca03fca14a Insert new information constants 2015-10-20 15:13:34 +02:00
Tim Daubenschütz 22a95f07fd Further cleanup 2015-10-20 15:10:18 +02:00
Tim Daubenschütz f0d8e32ecf Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_accordion_list/accordion_list_item_piece.js
	js/components/ascribe_app.js
	js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
	js/components/logout_container.js
	js/components/whitelabel/wallet/wallet_app.js
 2015-10-19 10:30:14 +02:00
diminator 74eb1ce3a2 spinner and some colors 
***FML***
 2015-10-16 13:30:36 +02:00
diminator f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +02:00
Tim Daubenschütz 32d317cdef add download button to loan form 2015-10-16 11:29:08 +02:00
diminator ed24ec194e added PR comments 2015-10-15 15:24:40 +02:00
Tim Daubenschütz 702f1d29f3 Styling 2015-10-15 11:41:46 +02:00
diminator d7cd92eb52 email styles 2015-10-15 10:08:22 +02:00
Tim Daubenschütz a1f159fc2d Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_detail/edition.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-15 10:06:39 +02:00
diminator b54beae322 cyland 
cc
 2015-10-14 17:13:16 +02:00
diminator 317d2611ba spinners part2 
scrollbar

uploader styles

property blur
 2015-10-14 16:17:10 +02:00
diminator a457439347 sluice styling 2015-10-14 12:12:06 +02:00
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