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 |
|
Cevo
|
434d852666
|
bug in the collection list handled
|
2015-10-09 14:38:18 +02:00 |
|
Cevo
|
b8f7527a0b
|
console.logs removed
|
2015-10-09 14:32:45 +02:00 |
|
Cevo
|
6fd8152d22
|
instrange badge removed, eslint gives an error for a necessary line of code so not modified, tested
|
2015-10-09 14:30:22 +02:00 |
|
Cevo
|
03680bd830
|
information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them)
|
2015-10-09 14:19:43 +02:00 |
|
Cevo
|
f2d02179a1
|
pullrequest changes
|
2015-10-08 13:19:59 +02:00 |
|
Cevo
|
087884ef3c
|
sharare button moved to the right
|
2015-10-08 10:14:50 +02:00 |
|
Cevo
|
924b462cc1
|
sharare button moved to the right
|
2015-10-08 10:14:06 +02:00 |
|
Cevo
|
11b2ab7b12
|
title added back in index.html (it was for a different ticket)
|
2015-10-07 13:58:02 +02:00 |
|
Cevo
|
bb3670ef4d
|
padding and border added
|
2015-10-07 13:52:30 +02:00 |
|
Cevo
|
70eedbabaf
|
line spacing in info text edited
|
2015-10-06 10:20:57 +02:00 |
|
Cevo
|
28ab655505
|
merged again with master
|
2015-09-30 10:53:52 +02:00 |
|
Cevo
|
23f10d4d7f
|
qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh
|
2015-09-30 10:53:16 +02:00 |
|
Tim Daubenschütz
|
e356570bc8
|
remove console log
|
2015-09-29 17:56:18 +02:00 |
|
diminator
|
ff8eb1ea06
|
Merged in AD-757-cc-license-info-is-ambiguous-or-m (pull request #87)
cc fixes in licenses, collection and details
|
2015-09-29 17:32:53 +02:00 |
|
diminator
|
08c3bfe7fb
|
acl for powered_by
|
2015-09-29 16:48:46 +02:00 |
|
diminator
|
f64fb73aa6
|
cc fixes in licenses, collection and details
|
2015-09-29 15:58:24 +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 |
|
Cevo
|
7b9424ca68
|
merging from master and resolving the conflicts in main.scss, master overrides
|
2015-09-29 11:59:18 +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 |
|
Cevo
|
b6cfafc917
|
unused css class removed
|
2015-09-29 11:04:20 +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
|
df338ac746
|
Fix alignment for AclInformationButton
|
2015-09-29 10:31:13 +02:00 |
|
Cevo
|
196219f106
|
reached the spec with dirty tricks
|
2015-09-28 22:10:00 +02:00 |
|
Cevo
|
661cb44b94
|
reached the spec with dirty tricks
|
2015-09-28 22:09:25 +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 |
|