summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Fix share mounting recursionVincent Petry2016-03-081-0/+2
|
* Fix group sharing and sharing permissions - fixes #22932Thomas Müller2016-03-085-18/+31
|
* Merge pull request #22885 from owncloud/master-show-version-to-update-toThomas Müller2016-03-082-3/+6
|\ | | | | Show version to update to properly
| * Show version to update to properlyLukas Reschke2016-03-052-3/+6
| | | | | | | | Properly shows the version that will be updated to.
* | Merge pull request #22915 from owncloud/cleanup_ocs_share_apiThomas Müller2016-03-081-57/+37
|\ \ | | | | | | Cleanup OCS Share Api
| * | Can't convert node to stringRoeland Jago Douma2016-03-071-1/+6
| | |
| * | Move common code to functionRoeland Jago Douma2016-03-071-56/+31
| | | | | | | | | | | | | | | The code to get a share by id is somewhat messy. And was duplicated. Now this is done is a separate function
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0818-12/+64
| | |
* | | Merge pull request #22880 from owncloud/fix-21656Thomas Müller2016-03-072-1/+4
|\ \ \ | | | | | | | | improve log output when no LDAP user was found on login attempt
| * | | improve log output when no LDAP user was found on login attemptArthur Schiwon2016-03-052-1/+4
| | | |
* | | | Calendar and addressbook migration commands are always availableThomas Müller2016-03-071-10/+2
| | | |
* | | | Handle addressbook migration issue by writing the faulty event to the log ↵Thomas Müller2016-03-073-7/+32
| | | | | | | | | | | | | | | | and continue
* | | | Handle calendar migration issue by writing the faulty event to the log and ↵Thomas Müller2016-03-073-11/+34
| |/ / |/| | | | | | | | continue
* | | Merge pull request #22902 from owncloud/share-archivenamedownloadallThomas Müller2016-03-072-3/+5
|\ \ \ | | | | | | | | Fix archive file name when downloading public share
| * | | Remove "files" arg from download URL in public link pageVincent Petry2016-03-071-2/+4
| | | | | | | | | | | | | | | | | | | | When no files were specified for download, it means folder download. In this case, no need to pass an empty "files" argument.
| * | | Fix archive file name when downloading public shareVincent Petry2016-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download a public link share folder using the button on the top right, it doesn't provide a list of files. This fix makes sure to trigger the correct logic when no file list was given.
* | | | Merge pull request #22898 from ↵Thomas Müller2016-03-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/quota-allowuploadwhenfreespaceisunlimited Fix uploading to fed share when free space is unlimited
| * | | | Fix uploading when free space is unlimitedVincent Petry2016-03-071-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | A federated share can report unlimited quota as -3, so the ajax/upload.php code needs to be adjusted to block uploads when the free space is unlimited.
* | | | Merge pull request #22787 from owncloud/versions-fixmtimetooltipThomas Müller2016-03-071-1/+3
|\ \ \ \ | | | | | | | | | | Fix tooltip for versions mtime
| * | | | Fix tooltip for versions mtimeVincent Petry2016-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | It was missing a call to jquery.tooltip
* | | | | Merge pull request #22785 from owncloud/trash-returnfalseon401Thomas Müller2016-03-072-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Return false on 401 in file list + trash file list
| * | | | | Return false on 401 in file list + trash file listVincent Petry2016-03-032-0/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | This gives a chance to the global ajax error handler to do its work if the session expired.
* | | | | Merge pull request #22896 from owncloud/fix-v1-carddav-endpointThomas Müller2016-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Correctly default to null and add type hint
| * | | | | Correctly default to null and add type hintJoas Schilling2016-03-071-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #22244 from owncloud/dont-update-shared-resource-propertiesThomas Müller2016-03-075-3/+84
|\ \ \ \ \ | |/ / / / |/| | | | For 9.0 we don't have the possibility to store calendar and addressbo…
| * | | | Allow to change properties of readonly calendarsJoas Schilling2016-02-291-0/+8
| | | | |
| * | | | Allow to hide a shared calendarJoas Schilling2016-02-292-4/+29
| | | | |
| * | | | For 9.0 we don't have the possibility to store calendar and addressbook ↵Thomas Müller2016-02-294-3/+51
| | | | | | | | | | | | | | | | | | | | properties on a per-user basis and therefore we simple don't allow this for now
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0746-8/+346
| | | | |
* | | | | Merge pull request #22859 from ↵Thomas Müller2016-03-061-2/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/cache-results-in-memcache-for-is-owncloud Cache results of testRemoteUrl
| * | | | | Cache results of testRemoteUrlLukas Reschke2016-03-041-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud. Replaces https://github.com/owncloud/core/pull/22855
* | | | | | Merge pull request #22807 from owncloud/remove-empty-translationsThomas Müller2016-03-0616-112/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | ne, or_IN, uz and yo have been removed from transifex and will be rem…
| * | | | | | ne, or_IN, uz and yo have been removed from transifex and will be removed ↵Thomas Müller2016-03-0316-112/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | from git here now as well
* | | | | | | Merge pull request #22888 from owncloud/use-custom-headerThomas Müller2016-03-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use custom header
| * | | | | | | Use custom headerLukas Reschke2016-03-051-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHP in CGI mode eats the Authorization header => :bomb:
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0616-0/+56
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-05124-154/+422
| | | | | |
* | | | | | Merge pull request #22878 from owncloud/use-clob-for-timezoneC. Montero Luque2016-03-042-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Use CLOB for timezone
| * | | | | Use CLOB for timezoneLukas Reschke2016-03-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long. This changes it back to a CLOB as it has been before as well: https://github.com/owncloudarchive/calendar/commit/8d8bb68b010fc2c42a258dee43516404a95ab861. I'm not super convinced that CLOB is the best choice here but at least it seems to work. Fixes https://github.com/owncloud/core/issues/22876
* | | | | | Merge pull request #22870 from owncloud/autoenable-federation-appC. Montero Luque2016-03-041-11/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Automatically enable "federation" app
| * \ \ \ \ \ Merge branch 'master' into autoenable-federation-appC. Montero Luque2016-03-041-1/+1
| |\ \ \ \ \ \
| * | | | | | | Automatically enable "federation" appLukas Reschke2016-03-041-11/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'master' into fix-db-locking-cleanupC. Montero Luque2016-03-0410-17/+229
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #22860 from owncloud/trashbin-checkpathC. Montero Luque2016-03-041-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Properly check path validity before deleting to trash
| | * | | | | Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents deleting the whole "files" folder of the user whenever $ownerPath is empty. This can happen in concurrency situations.
| * | | | | | Merge pull request #22857 from owncloud/add-release-channel-selectionThomas Müller2016-03-047-14/+219
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add release channel selection back
| | * | | | | | Add release channel selection backLukas Reschke2016-03-047-14/+219
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Allows to select the release channels again and also shows the last check date
| * | | | | | Merge pull request #22816 from owncloud/external-unavailable-recheckThomas Müller2016-03-042-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | allow availability recheck for external storages
| | * | | | | Properly set exception in FailedStorageVincent Petry2016-03-032-1/+7
| | | | | | |
| | * | | | | allow availability recheck for external storagesRobin Appelman2016-03-031-1/+2
| | | | | | |