summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-0862-116/+69
|
* Merge pull request #9495 from owncloud/remove-moved-mountVincent Petry2014-07-073-8/+21
|\ | | | | When changing the mountpoint of an external storage, ensure the old one ...
| * When changing the mountpoint of an external storage, ensure the old one is ↵Robin Appelman2014-07-073-8/+21
| | | | | | | | removed
* | Merge pull request #9499 from owncloud/shares-hidetokenrecipientMorris Jobke2014-07-072-1/+45
|\ \ | | | | | | Do not show recipient for link shares in file list
| * | Do not show recipient for link shares in file listVincent Petry2014-07-072-1/+45
| |/ | | | | | | | | | | | | | | In the "Shared with link" section, the share_with field can contain a value when a password was set. This fix prevents this value to be shown as it is not intended for the end user.
* | Merge pull request #9502 from owncloud/add_ocsidsMorris Jobke2014-07-0714-7/+14
|\ \ | | | | | | Add ocsids for shipped apps in core repo
| * | add ocsids to info.xmlGeorg Ehrke2014-07-0714-7/+14
| |/
* | Merge pull request #9415 from owncloud/external-sharedialogMorris Jobke2014-07-071-4/+31
|\ \ | | | | | | Improved external share dialog
| * | Improved external share dialogVincent Petry2014-07-071-4/+31
| |/ | | | | | | | | Changed title, label and buttons. Removed icon.
* / Fixed shared list sortingVincent Petry2014-07-071-3/+2
|/ | | | | Use Array.sort instead of underscore's sortBy() as they don't use the same method/function signature.
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-072-0/+3
|
* Merge pull request #9453 from owncloud/enc_fix_wrong_file_sizeFrank Karlitschek2014-07-062-6/+10
|\ | | | | [encryption] always take unencrypted size
| * improved unit testsBjoern Schiessle2014-07-041-4/+8
| |
| * always take unencrypted sizeBjoern Schiessle2014-07-041-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-062-0/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0599-99/+33
| |
* | Merge pull request #9357 from owncloud/sharing_unshare_on_deleteBjörn Schießle2014-07-047-46/+52
|\ \ | | | | | | [sharing] unshare childrens on delete
| * | add owner as parameter for delShareKeyBjoern Schiessle2014-07-043-11/+18
| | |
| * | make sure that the umount hook always contains the path relative to ↵Bjoern Schiessle2014-07-041-1/+1
| | | | | | | | | | | | data/user/files
| * | if a folder gets deleted we unshare all shared files/folders belowBjoern Schiessle2014-07-044-34/+33
| |/
* | Merge pull request #9445 from owncloud/filelist-auth-erroricewind19912014-07-042-2/+35
|\ \ | | | | | | Reload the page when the files app encounters an authentication error
| * | Add machine readable error messages to OC\JSONRobin Appelman2014-07-042-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload the files app in case of authentication errors, expired tokens or disabled app Reloading will triger the full server side handeling of those errors formatting fix missing semicolon + some jshint warnings
* | | Merge pull request #9434 from owncloud/files-reloadpromiseissueMorris Jobke2014-07-043-15/+7
|\ \ \ | |/ / |/| | Fix reload call for all subclasses
| * | Fix reload call for all subclassesVincent Petry2014-07-043-15/+7
| |/ | | | | | | All subclasses must also properly return the ajax call object.
* | Merge pull request #9269 from owncloud/fix_versions_previewThomas Müller2014-07-041-3/+3
|\ \ | | | | | | change order of registering api and capabilities to fix file version previews
| * | change order of registering api and capabilities to fix file version previewsJörn Friedrich Dreyer2014-07-011-3/+3
| | |
* | | Merge pull request #9440 from owncloud/files-fileactionsdeepcopyMorris Jobke2014-07-042-10/+156
|\ \ \ | | | | | | | | Fix FileActions merging override
| * | | Fix FileActions merging overrideVincent Petry2014-07-042-10/+156
| | |/ | |/| | | | | | | | | | | | | When merging FileActions, the register() functio needs to correctly override the previously merged action handler without affecting the original one.
* | | Merge pull request #9426 from owncloud/design-remoteshare-confirmMorris Jobke2014-07-043-8/+35
|\ \ \ | | | | | | | | use icon-confirm instead of text for accepting remote share, works better with translations
| * | | IE8 fixesMorris Jobke2014-07-041-1/+10
| | | |
| * | | use icon-confirm instead of text for accepting remote share, works better ↵Jan-Christoph Borchardt2014-07-043-8/+26
| | | | | | | | | | | | | | | | with translations
* | | | Return and use isPreviewAvailable for share previewsVincent Petry2014-07-042-5/+10
| |/ / |/| | | | | | | | | | | Since the mime type is known, now isPreviewAvailable is returned as well and used by the JS side to properly render mime icon and previews.
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0470-4/+126
|/ /
* | Merge pull request #9420 from owncloud/trashbin-hidesummarysizeMorris Jobke2014-07-031-0/+3
|\ \ | | | | | | Hide the size in the trashbin summary row
| * | Hide the size in the trashbin summary rowVincent Petry2014-07-031-0/+3
| | | | | | | | | | | | | | | This also fixes the extra spacing that appearing on the right of the table.
* | | Merge pull request #9407 from owncloud/fix-share-logoMorris Jobke2014-07-031-1/+1
|\ \ \ | |/ / |/| | for shared links, use wide logo on desktop and icon on mobile
| * | for shared links, use wide logo on desktop and icon on mobileJan-Christoph Borchardt2014-07-031-1/+1
| | |
* | | Merge pull request #9403 from owncloud/design-fix-fileslistbottomMorris Jobke2014-07-032-3/+7
|\ \ \ | | | | | | | | Fix bottom of files list, add proper space to have room for dropdowns
| * | | reduce file list bottom whitespace a bitJan-Christoph Borchardt2014-07-031-1/+1
| | | |
| * | | fix left margin of file list summaryJan-Christoph Borchardt2014-07-032-1/+5
| | | |
| * | | add whitespace to bottom of Files list – more obvious it's the end, and ↵Jan-Christoph Borchardt2014-07-031-2/+2
| |/ / | | | | | | | | | space for share dropdown
* | | Merge pull request #9394 from owncloud/design-fix-renameJan-Christoph Borchardt2014-07-031-4/+5
|\ \ \ | |/ / |/| | fix position of rename function, and text size
| * | fix checkbox shifting when rename input appearsJan-Christoph Borchardt2014-07-031-0/+2
| | |
| * | fix position of rename function, and text sizeJan-Christoph Borchardt2014-07-031-4/+3
| | |
* | | Merge pull request #9391 from owncloud/design-mobile-shareJan-Christoph Borchardt2014-07-033-4/+11
|\ \ \ | | | | | | | | Fix mobile share view glitches
| * | | use same logo for mobile as for when logged in, fix #9360Jan-Christoph Borchardt2014-07-021-2/+4
| | | |
| * | | hide text of download button, only show iconJan-Christoph Borchardt2014-07-022-1/+6
| | | |
| * | | shared view: remove whitespace glitch on rightJan-Christoph Borchardt2014-07-021-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-0330-53/+18
| |/ / |/| |
* | | Merge pull request #9389 from owncloud/fix-nametext-heightJan-Christoph Borchardt2014-07-031-0/+1
|\ \ \ | | | | | | | | fix nametext height, was higher than the row