Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-08 | 62 | -116/+69 |
| | |||||
* | Merge pull request #9495 from owncloud/remove-moved-mount | Vincent Petry | 2014-07-07 | 3 | -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 Appelman | 2014-07-07 | 3 | -8/+21 |
| | | | | | | | | removed | ||||
* | | Merge pull request #9499 from owncloud/shares-hidetokenrecipient | Morris Jobke | 2014-07-07 | 2 | -1/+45 |
|\ \ | | | | | | | Do not show recipient for link shares in file list | ||||
| * | | Do not show recipient for link shares in file list | Vincent Petry | 2014-07-07 | 2 | -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_ocsids | Morris Jobke | 2014-07-07 | 14 | -7/+14 |
|\ \ | | | | | | | Add ocsids for shipped apps in core repo | ||||
| * | | add ocsids to info.xml | Georg Ehrke | 2014-07-07 | 14 | -7/+14 |
| |/ | |||||
* | | Merge pull request #9415 from owncloud/external-sharedialog | Morris Jobke | 2014-07-07 | 1 | -4/+31 |
|\ \ | | | | | | | Improved external share dialog | ||||
| * | | Improved external share dialog | Vincent Petry | 2014-07-07 | 1 | -4/+31 |
| |/ | | | | | | | | | Changed title, label and buttons. Removed icon. | ||||
* / | Fixed shared list sorting | Vincent Petry | 2014-07-07 | 1 | -3/+2 |
|/ | | | | | Use Array.sort instead of underscore's sortBy() as they don't use the same method/function signature. | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-07 | 2 | -0/+3 |
| | |||||
* | Merge pull request #9453 from owncloud/enc_fix_wrong_file_size | Frank Karlitschek | 2014-07-06 | 2 | -6/+10 |
|\ | | | | | [encryption] always take unencrypted size | ||||
| * | improved unit tests | Bjoern Schiessle | 2014-07-04 | 1 | -4/+8 |
| | | |||||
| * | always take unencrypted size | Bjoern Schiessle | 2014-07-04 | 1 | -2/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-06 | 2 | -0/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-05 | 99 | -99/+33 |
| | | |||||
* | | Merge pull request #9357 from owncloud/sharing_unshare_on_delete | Björn Schießle | 2014-07-04 | 7 | -46/+52 |
|\ \ | | | | | | | [sharing] unshare childrens on delete | ||||
| * | | add owner as parameter for delShareKey | Bjoern Schiessle | 2014-07-04 | 3 | -11/+18 |
| | | | |||||
| * | | make sure that the umount hook always contains the path relative to ↵ | Bjoern Schiessle | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | data/user/files | ||||
| * | | if a folder gets deleted we unshare all shared files/folders below | Bjoern Schiessle | 2014-07-04 | 4 | -34/+33 |
| |/ | |||||
* | | Merge pull request #9445 from owncloud/filelist-auth-error | icewind1991 | 2014-07-04 | 2 | -2/+35 |
|\ \ | | | | | | | Reload the page when the files app encounters an authentication error | ||||
| * | | Add machine readable error messages to OC\JSON | Robin Appelman | 2014-07-04 | 2 | -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-reloadpromiseissue | Morris Jobke | 2014-07-04 | 3 | -15/+7 |
|\ \ \ | |/ / |/| | | Fix reload call for all subclasses | ||||
| * | | Fix reload call for all subclasses | Vincent Petry | 2014-07-04 | 3 | -15/+7 |
| |/ | | | | | | | All subclasses must also properly return the ajax call object. | ||||
* | | Merge pull request #9269 from owncloud/fix_versions_preview | Thomas Müller | 2014-07-04 | 1 | -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 previews | Jörn Friedrich Dreyer | 2014-07-01 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #9440 from owncloud/files-fileactionsdeepcopy | Morris Jobke | 2014-07-04 | 2 | -10/+156 |
|\ \ \ | | | | | | | | | Fix FileActions merging override | ||||
| * | | | Fix FileActions merging override | Vincent Petry | 2014-07-04 | 2 | -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-confirm | Morris Jobke | 2014-07-04 | 3 | -8/+35 |
|\ \ \ | | | | | | | | | use icon-confirm instead of text for accepting remote share, works better with translations | ||||
| * | | | IE8 fixes | Morris Jobke | 2014-07-04 | 1 | -1/+10 |
| | | | | |||||
| * | | | use icon-confirm instead of text for accepting remote share, works better ↵ | Jan-Christoph Borchardt | 2014-07-04 | 3 | -8/+26 |
| | | | | | | | | | | | | | | | | with translations | ||||
* | | | | Return and use isPreviewAvailable for share previews | Vincent Petry | 2014-07-04 | 2 | -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 transifex | Jenkins for ownCloud | 2014-07-04 | 70 | -4/+126 |
|/ / | |||||
* | | Merge pull request #9420 from owncloud/trashbin-hidesummarysize | Morris Jobke | 2014-07-03 | 1 | -0/+3 |
|\ \ | | | | | | | Hide the size in the trashbin summary row | ||||
| * | | Hide the size in the trashbin summary row | Vincent Petry | 2014-07-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | This also fixes the extra spacing that appearing on the right of the table. | ||||
* | | | Merge pull request #9407 from owncloud/fix-share-logo | Morris Jobke | 2014-07-03 | 1 | -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 mobile | Jan-Christoph Borchardt | 2014-07-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9403 from owncloud/design-fix-fileslistbottom | Morris Jobke | 2014-07-03 | 2 | -3/+7 |
|\ \ \ | | | | | | | | | Fix bottom of files list, add proper space to have room for dropdowns | ||||
| * | | | reduce file list bottom whitespace a bit | Jan-Christoph Borchardt | 2014-07-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix left margin of file list summary | Jan-Christoph Borchardt | 2014-07-03 | 2 | -1/+5 |
| | | | | |||||
| * | | | add whitespace to bottom of Files list – more obvious it's the end, and ↵ | Jan-Christoph Borchardt | 2014-07-03 | 1 | -2/+2 |
| |/ / | | | | | | | | | | space for share dropdown | ||||
* | | | Merge pull request #9394 from owncloud/design-fix-rename | Jan-Christoph Borchardt | 2014-07-03 | 1 | -4/+5 |
|\ \ \ | |/ / |/| | | fix position of rename function, and text size | ||||
| * | | fix checkbox shifting when rename input appears | Jan-Christoph Borchardt | 2014-07-03 | 1 | -0/+2 |
| | | | |||||
| * | | fix position of rename function, and text size | Jan-Christoph Borchardt | 2014-07-03 | 1 | -4/+3 |
| | | | |||||
* | | | Merge pull request #9391 from owncloud/design-mobile-share | Jan-Christoph Borchardt | 2014-07-03 | 3 | -4/+11 |
|\ \ \ | | | | | | | | | Fix mobile share view glitches | ||||
| * | | | use same logo for mobile as for when logged in, fix #9360 | Jan-Christoph Borchardt | 2014-07-02 | 1 | -2/+4 |
| | | | | |||||
| * | | | hide text of download button, only show icon | Jan-Christoph Borchardt | 2014-07-02 | 2 | -1/+6 |
| | | | | |||||
| * | | | shared view: remove whitespace glitch on right | Jan-Christoph Borchardt | 2014-07-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-03 | 30 | -53/+18 |
| |/ / |/| | | |||||
* | | | Merge pull request #9389 from owncloud/fix-nametext-height | Jan-Christoph Borchardt | 2014-07-03 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | fix nametext height, was higher than the row |