Thomas Müller
1075914f8a
Merge pull request #14883 from owncloud/imagepng_expects_resource_issue
...
validate resource's integrity before using it
2015-03-16 12:22:27 +01:00
Georg Ehrke
09b05373ed
validate resource's integrity before using it
2015-03-16 10:57:01 +01:00
Morris Jobke
997a7a2668
Merge pull request #14766 from owncloud/fix-insertifnotexists-poc
...
Allow specifying the compare-array for insertIfNotExists()
2015-03-16 10:31:36 +01:00
Thomas Müller
1e0d8f1774
Merge pull request #14133 from rullzer/fix_10600
...
Always display max upload size in admin panel
2015-03-16 10:05:57 +01:00
Thomas Müller
bbaf97ca43
Merge pull request #14644 from owncloud/trash-expire-command
...
Expire files from the trash in the background
2015-03-16 10:04:05 +01:00
Thomas Müller
6927773648
Merge pull request #14776 from owncloud/fix-14629-master
...
verify the file name length not to exceed 255 characters + verify path d...
2015-03-16 09:58:41 +01:00
Thomas Müller
b159c7f274
Merge pull request #14848 from owncloud/kill-curl-fallback-master
...
drop any fallback code related to curl
2015-03-16 09:56:31 +01:00
Jenkins for ownCloud
c1a3394f48
[tx-robot] updated from transifex
2015-03-16 01:55:15 -04:00
Morris Jobke
5d74534f06
Merge pull request #14899 from owncloud/setupwarning-text
...
Put notice about checking logs in setup warning
2015-03-15 20:20:32 +01:00
Jenkins for ownCloud
84b6ca9b81
[tx-robot] updated from transifex
2015-03-15 01:54:38 -04:00
Robin McCorkell
69d376fbf1
Put notice about checking logs in setup warning
2015-03-15 01:25:30 +00:00
Joas Schilling
82138d4255
Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-object
...
Fix getting the avatar of a non-existing user
2015-03-14 11:43:18 +01:00
Jenkins for ownCloud
8c5be2bc48
[tx-robot] updated from transifex
2015-03-14 01:54:45 -04:00
Thomas Müller
918b86a5bc
Merge pull request #14871 from owncloud/use-proper-error-type
...
Use proper error type and clean-up code
2015-03-13 23:30:49 +01:00
Thomas Müller
b8eb0b7cb6
Merge pull request #14880 from owncloud/drop-example-backend
...
Drop example user backend
2015-03-13 23:00:03 +01:00
Joas Schilling
30357aaac0
No user no avatar easy as that
2015-03-13 17:35:34 +01:00
Lukas Reschke
e77d2ff2b4
Remove outdated comment
2015-03-13 16:19:52 +01:00
Lukas Reschke
bf9030e874
Drop example user backend
...
We already provide an interface for application developers, this file is outdated and thus should get removed.
Addresses No. 3 from https://github.com/owncloud/core/issues/14847
2015-03-13 16:12:32 +01:00
Morris Jobke
0d9f149dd9
Merge pull request #14867 from owncloud/drop-OC_User_HTTP
...
Remove OC_User_HTTP
2015-03-13 15:53:22 +01:00
Joas Schilling
5d71eb5670
Color avatars of non-existing users gray and display X instead
2015-03-13 15:29:52 +01:00
Joas Schilling
61ec37431a
Fix order of expected and actual on assertEquals() calls
2015-03-13 15:29:52 +01:00
Joas Schilling
8304f5f508
Fix getting the avatar of a non-existing user
2015-03-13 15:29:52 +01:00
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