ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 17:45:10 +01:00
Code Issues Releases Wiki Activity
1,873 Commits 115 Branches 0 Tags 13 MiB
6500af121a
Commit Graph

1873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Daubenschütz
b2634c5b3f Upgrade react-router 2015-10-21 20:57:35 +02:00
TimDaubenschuetz
63505946e6 Merged in AD-1198-no-space-between-text-and-link-i (pull request #109) 
AD-1198 Add missing space to accordion list placeholder
 2015-10-21 16:37:09 +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
0655955027 Remove Source Sans Pro as its not being used anymore 2015-10-21 10:52:52 +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
Brett Sun
f1e9f4a0c8 Add missing space to accordion list placeholder 2015-10-21 09:57:40 +02:00
Tim Daubenschütz
fad6caca63 Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity 
Conflicts:
	js/components/ascribe_detail/edition_container.js
	js/components/logout_container.js
 2015-10-21 09:47:14 +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
ddc2e7b919 Rename intersectAcls to intersectList and do some clean up 2015-10-20 18:10:48 +02:00
Tim Daubenschütz
8417c2781e Making AclInformation more robust by adding checks for if the information to display is available 2015-10-20 18:00:59 +02:00
Tim Daubenschütz
444de8ebd7 Remove potentially dangerous automatic upgrade for react-router 2015-10-20 17:42:19 +02:00
Tim Daubenschütz
738e94a43d Change helper texts 2015-10-20 17:22:40 +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
vrde
e220ee6fbb Merge branch 'AD-697-update-title-in-the-browser' 2015-10-20 15:06:41 +02:00
vrde
a1827b329c Merge branch 'AD-1195-window-videojs-is-not-a-func' 2015-10-20 15:04:47 +02:00
diminator
3a503db396 Merged in AD-1174-collecting-society-info-is-showi (pull request #102) 
Put CopyrightAssociationForm in AclProxy
 2015-10-20 14:41:45 +02:00
vrde
1a6ddf67ac Add fall back if client cannot load 3rd party libs 2015-10-20 14:16:49 +02:00
vrde
5f0329ccf6 Remove useless code 2015-10-20 11:35:32 +02:00
vrde
4ee26d7259 Update PR with fixes 2015-10-20 11:25:27 +02:00
vrde
7ce98d0433 Fix comments on PR 2015-10-19 17:24:49 +02:00
TimDaubenschuetz
5a35e40a76 Merged in AD-947-fileuploader-button-does-not-work (pull request #100) 
Remove stopPropagation for event in FileDragAndDrop
 2015-10-19 14:53:02 +02:00
Tim Daubenschütz
019ff6c7ed Fix simulate click for Opera 2015-10-19 14:22:20 +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
TimDaubenschuetz
d66c201a98 Merged in AD-727-missing-redirects-to-login-page (pull request #95) 
Ad 727 missing redirects to login page
 2015-10-19 10:13:54 +02:00
diminator
54333c4ebe Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-16 13:31:42 +02:00
diminator
74eb1ce3a2 spinner and some colors 
***FML***
 2015-10-16 13:30:36 +02:00
Tim Daubenschütz
b964bde281 Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-16 13:10:44 +02:00
Tim Daubenschütz
69e75f5ce0 Add AscribeSpinner to LogoutContainer 2015-10-16 13:10:18 +02:00
Tim Daubenschütz
5e6e2e8cb0 Redirect directly to /login on loggout 2015-10-16 13:01:54 +02:00
diminator
f8d2d39b2d thumbnails, header, footer, pager 2015-10-16 13:00:19 +02:00
TimDaubenschuetz
127145e333 Merged in AD-1181-add-download-button-for-contract (pull request #105) 
add download button to loan form
 2015-10-16 12:10:49 +02:00
Tim Daubenschütz
712ec74247 add getLangText 2015-10-16 12:10:28 +02:00
Cevo
0b716cfa19 warn added 2015-10-16 11:30:45 +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
TimDaubenschuetz
e804722c71 Merged in AD-679-concept-of-drag-is-nonsensical-fo (pull request #103) 
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
 2015-10-15 15:16:51 +02:00
TimDaubenschuetz
9dec5eab1d Merged in AD-744-search-filter-not-working-i-type- (pull request #97) 
Ad 744 search filter not working i type
 2015-10-15 15:16:33 +02:00
Tim Daubenschütz
8bb971d9df Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
	js/components/whitelabel/wallet/components/cyland/cyland_landing.js
 2015-10-15 11:55:44 +02:00
Tim Daubenschütz
702f1d29f3 Styling 2015-10-15 11:41:46 +02:00
Tim Daubenschütz
c7c83083d3 change layout of AclButtonList 2015-10-15 11:32:34 +02:00
Tim Daubenschütz
d77bdb25a5 Cleanup code 2015-10-15 11:17:16 +02:00
Tim Daubenschütz
2c8f262826 Add isRequired to aim prop 2015-10-15 10:21:21 +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