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

136 Commits

Author SHA1 Message Date
Brett Sun d2529bf015 Merge with master 2015-11-03 10:39:01 +01: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 ba553455d2 Remove ascribe_scrollbar.scss 2015-10-21 10:56:24 +02:00
diminator f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +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
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 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
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
vrde 6fd01b12a5 Fix mobile menu 2015-09-23 16:27:32 +02:00
vrde 1885440447 Landing now iterates over colors 2015-09-22 14:46:32 +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 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
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
Cevo 6a57a69e29 main.scss edited 2015-09-15 13:53:09 +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 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 801227cfee remove react-progress-bar for react-bootstrap progressbar 2015-09-09 14:11:52 +02:00
diminator 22aa0139ae terms and conditions page with accept/deny 
Needed: copyright societies in backend
 2015-09-07 12:03:59 +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
Tim Daubenschütz cd49a9c402 Create generic links in nav using routes 2015-08-25 16:33:26 +02:00
diminator 15bcd4ba14 average rating 
cyland bug fix
 2015-08-25 10:47:38 +02:00
Tim Daubenschütz 8a88f978c6 add start_from parameter to slide container 2015-08-19 15:30:48 +02:00
diminator 5b2e90a03c sorting acl and styling 2015-08-14 15:38:30 +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
diminator a27415eb86 jury dashboard + rating WIP 2015-08-10 15:23:13 +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 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 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