ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
1,455 Commits 115 Branches 0 Tags 13 MiB
aa908a1c57
Commit Graph

1455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Daubenschütz
aa908a1c57 PR Feedback: Simplify subdomain extraction 2015-09-30 11:09:04 +02:00
Tim Daubenschütz
d50d0faabe Write generic function for extracting subdomain and implement troughout whole app 2015-09-29 14:58:56 +02:00
diminator
8e62206a21 Merged in AD-456-bug-fix-sorting-menuitem (pull request #84) 
Ad 456 bug fix sorting menuitem
 2015-09-29 14:28:28 +02:00
diminator
ec0a458189 removed console log 2015-09-29 14:14:59 +02:00
diminator
33ba4ce07f li instead of menuitem 2015-09-29 14:13:15 +02:00
diminator
c4fc6ab97f debug console log 2015-09-29 13:22:24 +02:00
TimDaubenschuetz
dc71503abc Merged in AD-901-add-lint-for-scss (pull request #44) 
Ad 901 add lint for scss
 2015-09-29 11:37:46 +02:00
diminator
2205f18089 Merged in AD-456-ikonotv-branded-page-for-registra (pull request #83) 
Ad 456 ikonotv branded page for registra
 2015-09-29 11:03:46 +02:00
Tim Daubenschütz
e1ac3ca4c6 Add multi level ACLs for loan piece detail loan button 2015-09-28 17:39:58 +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
52fc19444a Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-28 17:22:02 +02:00
Tim Daubenschütz
4be3040396 Instead of transition from logout to login, we replace the state 2015-09-28 17:21:34 +02:00
diminator
9bb5a51fed bug fix show public note for anonymous 2015-09-28 17:11:15 +02:00
diminator
2dda22d848 fix: ikonotv redirect to collection if logged in 2015-09-28 16:57:46 +02:00
diminator
19f94110b7 fix: ikonotv redirect to collection if logged in 2015-09-28 16:57:35 +02:00
diminator
0a0a34b0e3 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra 2015-09-28 16:44:37 +02:00
Tim Daubenschütz
9045b9ec01 refresh piece list on every major acl action 2015-09-28 16:32:59 +02:00
diminator
db1ef91965 bug fix filterParams=null on sluice 2015-09-28 16:29:50 +02:00
Tim Daubenschütz
3ae362ac15 Fix queryParams glitch for slide show in register_piece 2015-09-28 15:59:36 +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
5b41e368ac Implement AclProxy for hash work in account settings 2015-09-28 12:00:13 +02:00
Tim Daubenschütz
62e85c66ac Rename 'Send loan request' to 'send contract' for ikonoTv 2015-09-28 11:51:02 +02:00
Tim Daubenschütz
afef5db150 Add proper button to create editions form 2015-09-28 10:19:12 +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
2e6acff56d Make user email uneditable 2015-09-28 10:02:07 +02:00
Tim Daubenschütz
827e734b6a remove .gitignore~ 2015-09-25 16:26:47 +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
diminator
7bc686e8a4 Merged in AD-940-spool-features-in-piece-detail-we (pull request #82) 
set collapsible default show=true
 2015-09-25 16:17:50 +02:00
diminator
5ddf89e020 forward to collection after contract sent 2015-09-25 15:39:36 +02:00
diminator
b2cbe2c674 merged 2015-09-25 15:35:36 +02:00
diminator
e6a6c2c2a3 set collapsible default show=true 2015-09-25 15:33:01 +02:00
TimDaubenschuetz
a4975e8137 Merged in AD-1036-put-contracts-in-his-own-menu (pull request #79) 
Ad 1036 put contracts in his own menu
 2015-09-25 15:29:21 +02:00
Tim Daubenschütz
5e98787288 Minor renaming fix 2015-09-25 15:25:34 +02:00
Tim Daubenschütz
cb452ce7bf PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex 2015-09-25 15:22:16 +02:00
TimDaubenschuetz
296680c431 Merged in AD-956-clicking-browser-back-button-from (pull request #81) 
Ad 956 clicking browser back button from
 2015-09-25 14:42:14 +02:00
Tim Daubenschütz
e20e378533 Remove PrizeDashboard from codebase, add coa_verify to prize app 2015-09-25 11:54:12 +02:00
Tim Daubenschütz
16e7a54b27 add coa_verify route to wallet_routes to avoid crash 2015-09-25 11:51:03 +02:00
Tim Daubenschütz
9080c84fa9 Implement word wrap for ContractSettings 2015-09-25 11:20:12 +02:00
Tim Daubenschütz
7d3c14d1cc Conditional header for + NEW WORK 2015-09-25 10:10:27 +02:00
Tim Daubenschütz
81aa052a8a Fix load piece method in WalletPieceContainer 2015-09-25 09:53:52 +02:00
Alberto Granzotto
a30c80e6fb Merged in AD-961-fix-mobile-menu (pull request #80) 
Fix mobile menu
 2015-09-23 16:28:09 +02:00
vrde
6fd01b12a5 Fix mobile menu 2015-09-23 16:27:32 +02:00
Tim Daubenschütz
a6f09c8f35 add acl for update button in ContractSettings 2015-09-23 16:09:12 +02:00
Tim Daubenschütz
74e7c9a3d9 Integrate new ACLOptions into settings 2015-09-23 15:41:12 +02:00
Tim Daubenschütz
2a4bc2af89 separate contract settings from account settings 2015-09-23 15:16:46 +02:00
Tim Daubenschütz
4302da2f81 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-23 14:22:09 +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
Tim Daubenschütz
4acbc2c923 fix InputTextareaToggable 2015-09-23 14:12:33 +02:00