Commit Graph

23510 Commits

Author SHA1 Message Date
Lukas Reschke f668ed25fe Merge pull request #14874 from owncloud/correct-typehint
Can also be null
2015-03-13 14:36:00 +01:00
Lukas Reschke 38fec9b095 Can also be null
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
2015-03-13 14:01:24 +01:00
Lukas Reschke 4eb118dd33 Use proper error type and clean-up code 2015-03-13 13:21:09 +01:00
blizzz d5e884d629 Merge pull request #14849 from owncloud/fix-11292
support paged results against 389ds.
2015-03-13 13:16:33 +01:00
Lukas Reschke 93a303970f Remove OC_User_HTTP
Addresses No. 1 from https://github.com/owncloud/core/issues/14847
2015-03-13 12:26:33 +01:00
Thomas Müller c546f0bf46 Merge pull request #14844 from owncloud/fix-14843-master
cron shall not operate in case we are in maintenance mode
2015-03-13 09:25:05 +01:00
Jenkins for ownCloud d17630d6be [tx-robot] updated from transifex 2015-03-13 01:54:55 -04:00
Arthur Schiwon f28f7754ae support paged results against 389ds. 2015-03-12 22:47:20 +01:00
Thomas Müller 5855108e9b drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-78586447 2015-03-12 21:43:41 +01:00
Thomas Müller e3fd13de88 cron shall not operate in case we are in maintenance mode - fixes #14843 2015-03-12 21:03:26 +01:00
Thomas Müller 68a7041348 Merge pull request #14838 from owncloud/add-curl-hard-dependency
Add cURL as hard-dependency
2015-03-12 20:37:14 +01:00
Lukas Reschke 00f5025ff1 Add cURL as hard-dependency
It is required by other functionalities such as S2S anyways and ownCloud will fail hard at a lot of places without it.
2015-03-12 18:39:54 +01:00
Morris Jobke 23cc3cc5f2 Merge pull request #14830 from owncloud/kill-locks-table-master
we no longer support webdav locks - no need to keep the column
2015-03-12 16:12:26 +01:00
Thomas Müller 3ff484e695 we no longer support webdav locks - no need to keep the column 2015-03-12 15:23:44 +01:00
Thomas Müller 80ef53eff0 verify the file name length not to exceed 255 characters + verify path during rename 2015-03-12 10:47:47 +01:00
Thomas Müller 5054b8e4aa Merge pull request #14785 from owncloud/issue/14733-active-class-missing-for-admin-navigation-entry
Do not overwrite the active menu entry of the navigation
2015-03-12 10:45:03 +01:00
Morris Jobke 89e1b920cc Merge pull request #14613 from kampka/no-table-prefix
Install command should not require table prefix
2015-03-12 10:06:21 +01:00
Joas Schilling fefcbb966b Also use all keys for an empty array, just in case 2015-03-12 09:18:43 +01:00
Jenkins for ownCloud 454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Thomas Müller 84a5d43ed6 Merge pull request #14809 from rullzer/avatarcontroller_cache_fix
Fix the avatarcontroller cache needing the cache dir
2015-03-11 23:27:47 +01:00
Christian Kampka 277503209a Install command should not require table prefix 2015-03-11 21:06:25 +01:00
Morris Jobke dbd2bb66e9 Merge pull request #14357 from owncloud/fix/1373
Run `updateDataDirectory` after Update
2015-03-11 18:33:51 +01:00
Roeland Jago Douma 3560b32dfc Fix the avatarcontroller cache needing the cache dir
This was removed in 82254ad5ef and
unfortunatly missed by jenkins before mering into master.
2015-03-11 18:18:33 +01:00
Lukas Reschke f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller
Move AvatarController to AppFramework
2015-03-11 17:15:42 +01:00
Morris Jobke 82254ad5ef Merge pull request #13893 from owncloud/create-cachedir-on-user
Only make sure the cache directory exists when we use it
2015-03-11 16:49:24 +01:00
Roeland Jago Douma 1a0f9c375b Avatar controller moved to AppFrameWork
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
2015-03-11 16:37:42 +01:00
Lukas Reschke 73dc02d42c Merge pull request #14798 from owncloud/enable-oci-autotest-master
Setting oci as supported database
2015-03-11 16:14:54 +01:00
Morris Jobke caa672ceeb Merge pull request #14794 from owncloud/add-console-command-user-add
Add a console command user:add to create users over the console
2015-03-11 16:09:23 +01:00
Morris Jobke 04eef93b25 Merge pull request #13648 from oparoz/sfnt-fonts-preview
Add support for font previews
2015-03-11 15:56:32 +01:00
Thomas Müller 96b223676d Don't play with config values ... 2015-03-11 15:47:24 +01:00
Lukas Reschke cf25e6f569 Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view
Allow iframes from same domain in share view
2015-03-11 15:13:59 +01:00
Robin Appelman 169031d1c5 fix factory test 2015-03-11 15:07:59 +01:00
Robin Appelman e1f2a6df94 Allow setting the watcher policy as mount option 2015-03-11 15:07:23 +01:00
Robin Appelman 7adda88786 Copy mount options to the storage 2015-03-11 15:06:48 +01:00
Robin Appelman 4f0f175f8b Allow getting all mount options as array 2015-03-11 15:06:12 +01:00
Robin Appelman 82a62fd249 Add test for storage factory 2015-03-11 15:06:12 +01:00
Robin Appelman e5c8fd37df pass mountpoint to storage wrapper callback 2015-03-11 15:06:12 +01:00
Morris Jobke dbade19362 Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown
Better finding the remote URL from user input in share dropdown
2015-03-11 14:38:41 +01:00
Thomas Müller cba3ec2c7f Setting oci as supported database 2015-03-11 14:29:22 +01:00
Joas Schilling b1ff21ee28 Add a console command user:add to create users over the console 2015-03-11 14:22:23 +01:00
Morris Jobke ad97ceb787 Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail
Do not abort when meeting unfixable legacy storages
2015-03-11 13:32:33 +01:00
Lukas Reschke 8154ed4d2c Merge pull request #14791 from owncloud/fix-14516
Adding a more meaningful message for sabre dav exception
2015-03-11 12:52:18 +01:00
Thomas Müller 0d0f9a52d2 Merge pull request #14788 from cmeh/patch-3
Correct "one invalid characters" to "one invalid character"
2015-03-11 12:26:49 +01:00
Thomas Müller b3bb65eae5 Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
Add an option to include the installed app version in "occ app:list"
2015-03-11 12:23:22 +01:00
Thomas Müller 0f3e36fdfd Adding a more meaningful message for sabre dav exception - fixes #14516 2015-03-11 11:53:31 +01:00
Bernhard Posselt abb726c994 Merge pull request #14789 from owncloud/better-app-install-error-messages
display app update error messages
2015-03-11 11:28:28 +01:00
Joas Schilling 6a677ce8fe Do not make setupMounts() public just because of testing 2015-03-11 11:10:43 +01:00
Thomas Müller 3df1d9338e Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master
Use occ to install ownCloud in autotest.sh
2015-03-11 11:00:49 +01:00
Thomas Müller ffe06ac5c7 display app update error messages - fixes #14611 2015-03-11 09:59:56 +01:00
cmeh 4a0c649c8a Correct "one invalid characters" to "one invalid character"
Corrected "one invalid characters" to "one invalid character" in line 1575.
2015-03-11 09:59:42 +01:00