summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear.
* Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list.
* Merge pull request #25171 from owncloud/files_external-list-allVincent Petry2016-06-245-10/+81
|\ | | | | Add option to `occ files_external:list` to show all configured mounts
| * Add option to `occ files_external:list` to show all configured mountsRobin Appelman2016-06-235-10/+81
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-246-4/+68
| |
* | Merge pull request #25238 from owncloud/files-trashlistnamecorruptionVincent Petry2016-06-232-0/+24
|\ \ | |/ |/| Fix trashed file name corruption when rerendering trashbin list
| * Fix trashed file name corruption when rerendering trashbin listVincent Petry2016-06-232-0/+24
| | | | | | | | | | | | | | The trashbin code does some gymnastics with the file data at render time. This fix makes sure that the modifications done on the file data are only local to the rendering code and doesn't affect the actual file data from the file list.
* | Merge pull request #25225 from owncloud/enc-revertversionsizeVincent Petry2016-06-221-1/+8
|\ \ | | | | | | Rollback version must also adjust cached size
| * | Rollback version must also adjust cached sizeVincent Petry2016-06-221-1/+8
| | |
* | | Merge pull request #25223 from owncloud/external-list-default-optionsVincent Petry2016-06-221-1/+3
|\ \ \ | | | | | | | | Hide more default options in occ files_external:list
| * | | Hide more default options in occ files_external:listRobin Appelman2016-06-221-1/+3
| | | |
* | | | Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-225-15/+30
| | | |
* | | | Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-224-5/+20
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2218-6/+150
| | |
* | | Fix null pointer exception in user_ldap (#25062)Jörn Friedrich Dreyer2016-06-211-1/+8
| | |
* | | Merge pull request #24505 from owncloud/ceph-wait-for-httpVincent Petry2016-06-211-0/+5
|\ \ \ | | | | | | | | Don't rely on the notify socket but on the service responding
| * | | Wait for port being accessible in addition to the notify socketThomas Müller2016-06-171-0/+5
| | | |
* | | | Contacts API: replace raw image data with url (#25081)Georg Ehrke2016-06-2111-39/+384
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add uri to AddressBookImpl array * Introduce ImageExportPlugin for CardDav * add plugin to v1 routes * replace binary contact photo with link * update tests * Adding unit tests
* | | fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
| |/ |/|
* | Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
| |
* | Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| |
* | Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
| |
* | Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
|\ \ | | | | | | Fix conversion issues
| * | Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| |/ | | | | | | Change to phpdoc type for automatic conversion
* | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-203-7/+87
|\ \ | | | | | | Password login forbidden hint
| * | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-2/+2
| | | | | | | | | | | | | | | | | | The auth code from Sabre will forward NotAuthenticated exceptions but in the case of a generic exception, it is packaged as "service not available".
| * | throw PasswordLoginForbidden on DAVChristoph Wurst2016-06-173-3/+60
| | |
| * | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-172-6/+29
| | |
* | | Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
|\ \ \ | | | | | | | | Delay files_sharing's registerMountProviders
| * | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized.
* | | | Merge pull request #25010 from owncloud/gdrive-fix-testsVincent Petry2016-06-201-2/+2
|\ \ \ \ | | | | | | | | | | Fix GDrive test rename overwrite folder
| * | | | Fix GDrive test rename overwrite folderVincent Petry2016-06-101-2/+2
| | | | |
* | | | | Merge pull request #25161 from owncloud/fixgetsharefolderVincent Petry2016-06-202-5/+9
|\ \ \ \ \ | | | | | | | | | | | | Make getShareFolder use given view instead of static FS
| * | | | | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | |_|/ / | |/| | |
* | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newlineVincent Petry2016-06-202-3/+7
|\ \ \ \ \ | | | | | | | | | | | | files_external: Keep checkbox and its label on one line
| * | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-3/+7
| | |_|_|/ | |/| | | | | | | | | | | | | Else the checkbox and the decription end up on different lines in my Chrome on OS X
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2010-2/+56
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
|/ / / /
* / / / Changed global variable to localSergio Bertolín2016-06-171-1/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1718-4/+116
| | |
* | | Merge pull request #24965 from owncloud/streams-0.4.1Vincent Petry2016-06-165-52/+39
|\ \ \ | | | | | | | | update icewind/streams to 0.4.1
| * | | update icewind/streams to 0.4.1Robin Appelman2016-06-155-52/+39
| | |/ | |/|
* | | Move birthday calendar generation to a live migration job (#25135)Thomas Müller2016-06-165-66/+84
| | |
* | | Merge pull request #25104 from owncloud/dropbox-catchratelimitVincent Petry2016-06-161-0/+5
|\ \ \ | | | | | | | | Convert Dropbox Forbidden exception to StorageNotAvailableException
| * | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-141-0/+5
| | | |
* | | | Merge pull request #25103 from owncloud/fed-share-disable-cleanfolderVincent Petry2016-06-162-1/+43
|\ \ \ \ | |_|/ / |/| | | disable cleanFolder for the federated share storage
| * | | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| |/ /
* | | Merge pull request #25082 from owncloud/fix-sessionless-clientsVincent Petry2016-06-152-14/+6
|\ \ \ | | | | | | | | Fix sessionless clients
| * | | create session token only for clients that support cookiesChristoph Wurst2016-06-131-12/+5
| | | |
| * | | create session token on all APIsChristoph Wurst2016-06-131-2/+1
| | | |