summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15566 from owncloud/fix-filepickerThomas Müller2015-04-143-5/+28
|\ | | | | fix filepicker
| * fix filepickerMorris Jobke2015-04-133-5/+28
| | | | | | | | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563
* | Merge pull request #15585 from owncloud/fix-user-listLukas Reschke2015-04-132-3/+8
|\ \ | | | | | | Fix user list
| * | Fix user listMorris Jobke2015-04-132-3/+8
| | | | | | | | | | | | | | | * the name cell was changed from td to th because of accessibility issues - this adjusts the CSS and JS to behave like before
* | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-133-27/+77
|\ \ \ | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages
| * | | Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-133-27/+77
| |/ /
* | | Merge pull request #15360 from owncloud/cross-storage-move-cacheMorris Jobke2015-04-137-52/+151
|\ \ \ | |/ / |/| | Preserve cache data when doing a cross storage move
| * | Fix cross storage move with shared storagesRobin Appelman2015-04-133-14/+27
| | |
| * | upda testsRobin Appelman2015-04-131-6/+1
| | |
| * | Fix moving mount pointsRobin Appelman2015-04-131-1/+3
| | |
| * | check that we know the parentRobin Appelman2015-04-131-3/+5
| | |
| * | check for source cacheRobin Appelman2015-04-131-1/+3
| | |
| * | reuse cache move logicRobin Appelman2015-04-131-26/+1
| | |
| * | preserve cache data when doing a cross storage moveRobin Appelman2015-04-133-21/+131
| | |
* | | Merge pull request #15568 from ↵Thomas Müller2015-04-131-2/+11
|\ \ \ | |/ / |/| | | | | | | | owncloud/cache_user_folder_for_file_search_results cach user folder for file search results
| * | cach user folder for file search resultsJörn Friedrich Dreyer2015-04-131-2/+11
| | |
* | | Merge pull request #15570 from owncloud/shares-properlyformatmountpointMorris Jobke2015-04-133-4/+16
|\ \ \ | | | | | | | | Properly add trailing slash to mount point
| * | | Properly add trailing slash to mount pointVincent Petry2015-04-133-4/+16
| |/ / | | | | | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name
* | | Merge pull request #15564 from rullzer/fix_13709Vincent Petry2015-04-132-0/+29
|\ \ \ | |/ / |/| | Do not try to make user subadmin of group twice
| * | Do not try to make user subadmin of group twiceRoeland Jago Douma2015-04-132-0/+29
| |/ | | | | | | | | | | | | If the provisioning api is used to make a user subadmin of a group that user is already a subadmin just return success. Added unit test to ensure things keep working.
* | Merge pull request #15563 from ↵Morris Jobke2015-04-132-0/+48
|\ \ | |/ |/| | | | | owncloud/fix-try-getting-propert-of-non-object-ocsclient Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
| * Prevent php message: "Trying to get property of non-object at ↵Thomas Müller2015-04-132-0/+48
| | | | | | | | /xxx/lib/private/ocsclient.php#282"
* | Merge pull request #15562 from owncloud/fix-15560Joas Schilling2015-04-131-35/+48
|\ \ | |/ |/| Properly import used classes
| * Properly import used classesThomas Müller2015-04-131-35/+48
|/
* Merge pull request #15555 from rullzer/fix_15494Morris Jobke2015-04-121-1/+1
|\ | | | | Initial fix for #15494
| * Initial fix for #15494Roeland Jago Douma2015-04-121-1/+1
| |
* | Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-125-62/+392
|\ \ | | | | | | Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
| * | Add "Reply-To" support to sharing mails and refactor codeLukas Reschke2015-04-104-62/+370
| | |
| * | Add "Reply-To" support for mailsLukas Reschke2015-04-101-0/+22
| | |
* | | Merge pull request #15545 from owncloud/fix-fontsMorris Jobke2015-04-121-0/+7
|\ \ \ | |_|/ |/| | fix wrong typeface being used for some buttons
| * | fix wrong typeface being used for some buttonsJan-Christoph Borchardt2015-04-111-0/+7
|/ /
* | Merge pull request #15535 from owncloud/smb-1.0.0Morris Jobke2015-04-107-16/+38
|\ \ | | | | | | update icewind/smb to 1.0.0
| * | update icewind/smb to 1.0.0Robin Appelman2015-04-107-16/+38
| | |
* | | Merge pull request #15536 from owncloud/fix-mysql-autotestRobin McCorkell2015-04-101-1/+1
|\ \ \ | | | | | | | | [autotest.sh] use the DATABASEHOST for the mysql DB drop
| * | | [autotest.sh] use the DATABASEHOST for the mysql DB dropMorris Jobke2015-04-101-1/+1
| |/ /
* | | Merge pull request #15458 from owncloud/web-shell-masterLukas Reschke2015-04-102-32/+81
|\ \ \ | | | | | | | | Move console application to it's own class - allows reuse in the web shell
| * | | Throw an exception in case checkServer() returns errorsThomas Müller2015-04-091-0/+1
| | | |
| * | | Introduce own console application classThomas Müller2015-04-092-32/+80
| | | |
* | | | Merge pull request #15538 from owncloud/encryption-crypt-testsClark Tomlinson2015-04-102-29/+283
|\ \ \ \ | | | | | | | | | | add unit test for crypt.php
| * | | | add unit test for crypt.phpBjoern Schiessle2015-04-102-29/+283
| | | | |
* | | | | Merge pull request #15395 from owncloud/fix-imagepathVincent Petry2015-04-101-4/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix UrlGenerator::imagePath() for app paths
| * | | | | Fix UrlGenerator::imagePath() for app pathsRobin McCorkell2015-04-031-4/+6
| | | | | |
* | | | | | Merge pull request #15489 from owncloud/dont_hide_exceptions_masterThomas Müller2015-04-1013-134/+348
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont hide exceptions master
| * | | | | | Throw ServerNotAvailableException alwaysMorris Jobke2015-04-101-1/+1
| | | | | | |
| * | | | | | fix cherrypickingJörn Friedrich Dreyer2015-04-106-44/+56
| | | | | | |
| * | | | | | fix typo and commentMorris Jobke2015-04-102-3/+3
| | | | | | |
| * | | | | | fix filesystem and encryption testsJörn Friedrich Dreyer2015-04-101-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php apps/files_encryption/tests/hooks.php
| * | | | | | throw exception when backends don't provide a user instead of creating ↵Jörn Friedrich Dreyer2015-04-102-31/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | legacy local storages
| * | | | | | throw exception if setup is incompleteMorris Jobke2015-04-103-1/+33
| | | | | | |
| * | | | | | more robust share dialogMorris Jobke2015-04-101-0/+4
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 02:28:36 +0000