Thomas Müller
f3d49a89fe
Merge pull request #11131 from owncloud/use-phpini-wrapper
...
Replacing ini_get instances with inigetwrapper usages
2015-12-07 10:20:59 +01:00
Thomas Müller
0c3d97921f
Merge pull request #20904 from owncloud/view-mime-filter
...
Fix mimetype filter in getDirectoryContent
2015-12-07 10:20:43 +01:00
Thomas Müller
e1f2965e54
Merge pull request #20949 from owncloud/fix_20892
...
[Sharing] Properly check if a group already has access
2015-12-07 10:20:05 +01:00
Thomas Müller
085f3f58fa
Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_available
...
Settings user only load avatar if available
2015-12-07 10:19:38 +01:00
Thomas Müller
c1fb9fa483
Merge pull request #20957 from owncloud/use-correct-method-signature
...
Use correct method signature
2015-12-07 10:18:03 +01:00
Thomas Müller
c9069d5711
Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry
...
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-07 10:17:44 +01:00
Jenkins for ownCloud
884946276e
[tx-robot] updated from transifex
2015-12-07 01:54:35 -05:00
Jenkins for ownCloud
d14f128329
[tx-robot] updated from transifex
2015-12-06 01:54:33 -05:00
Jenkins for ownCloud
f0b1ba713d
[tx-robot] updated from transifex
2015-12-05 01:55:14 -05:00
Morris Jobke
46a6c6d70b
remove OC_App::getActiveNavigationEntry - not unsed anymore
2015-12-04 17:26:28 +01:00
Morris Jobke
e6d4496fc2
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-04 17:23:51 +01:00
Lukas Reschke
d522797227
Use correct method signature
...
This function takes only one parameter
2015-12-04 15:52:42 +01:00
Roeland Jago Douma
8c9a3ccefc
Do not request an avatar if there is none
2015-12-04 14:56:49 +01:00
Roeland Jago Douma
a619629ac0
Only try to load avatars in the user list if there is any
2015-12-04 14:56:49 +01:00
Vincent Petry
e91eba4b5b
Merge pull request #20370 from owncloud/external-db-config
...
Move files_external mount config to the database
2015-12-04 14:42:50 +01:00
Robin Appelman
a1898dc2bf
db config backend for files_external
2015-12-04 13:48:21 +01:00
Thomas Müller
98bb8372f7
Merge pull request #20947 from owncloud/delete-users-from-system-addressbook
...
Delete no longer existing users from system addressbook
2015-12-04 13:44:40 +01:00
Thomas Müller
5750a85e84
Merge pull request #20946 from robinkanters/patch-1
...
Fixed small typo in README
2015-12-04 12:26:19 +01:00
Roeland Jago Douma
11d8b336e2
[Sharing] Properly check if a group already has access
...
The old code check was to liberal resulting in wrong matches if a user
with the same name as the group already had access.
Fixes 20892
2015-12-04 12:22:21 +01:00
Thomas Müller
6af858c41b
Delete no longer existing users from system addressbook
2015-12-04 11:51:45 +01:00
Vincent Petry
af8bcb3a4d
Merge pull request #20943 from owncloud/load_avatar_once
...
[Avatars] JS should not load same avatar twice
2015-12-04 11:24:44 +01:00
Robin Kanters
eb9edb12f3
Fixed small typo in 'Access'
2015-12-04 11:14:24 +01:00
Roeland Jago Douma
50d862e5d1
[Avatars] JS should not load same avatar twice
...
Old code first dit an ajax request to the avatar. Then a new image
object with the same src was created and since we do not cache avatars
yet :( this resulted in 2 sequential requests to the exact same URL
Now if you set the displayname it will first set the placeholder and
then load the avatar in the background. Only once this time!
2015-12-04 10:42:11 +01:00
Thomas Müller
6034c9142d
Merge pull request #20933 from owncloud/more-OC_Config-cleanups
...
More cleanups of OC_Config usage
2015-12-04 09:06:47 +01:00
Thomas Müller
561ca002ae
Merge pull request #20931 from owncloud/dav-fixnamespaceoutput
...
Fix namespace XML output of files and tags dav
2015-12-04 08:31:21 +01:00
Jenkins for ownCloud
a2848af625
[tx-robot] updated from transifex
2015-12-04 01:56:31 -05:00
Thomas Müller
7d99289ced
Merge pull request #20907 from owncloud/integration_tests_for_capabilities
...
Added capabilities context and tests
2015-12-03 16:54:36 +01:00
Thomas Müller
602b636d3e
Merge pull request #20807 from owncloud/dont-append-redirect-url-if-user-is-already-logged-in
...
Don't append redirect URL if user is logged-in
2015-12-03 16:53:59 +01:00
Thomas Müller
2ceae43989
Merge pull request #20545 from owncloud/scan-storage-in-background-job
...
Move files/ajax/scan.php to background job
2015-12-03 16:53:46 +01:00
Morris Jobke
c60c793cf2
More cleanups of OC_Config usage
2015-12-03 16:41:23 +01:00
Vincent Petry
acdd106a24
Fix namespace XML output of files and tags dav
2015-12-03 15:55:10 +01:00
Thomas Müller
1fe7957fd0
Merge pull request #20924 from owncloud/use-url-generator-to-generate-link
...
Use URLGenerator instead of hard-coded WEBROOT
2015-12-03 15:26:14 +01:00
Thomas Müller
ec366f625e
Merge pull request #20923 from owncloud/OC_Config-in-setup
...
Replace OC_Config in setup
2015-12-03 15:24:58 +01:00
Thomas Müller
0fe5506e91
Merge pull request #20921 from owncloud/last-OC_Config-removals-in-tests
...
Reduce OC_Config usage in tests/
2015-12-03 15:24:41 +01:00
Lukas Reschke
1f69dcb593
Use URLGenerator instead of hard-coded WEBROOT
...
Fixes https://github.com/owncloud/core/issues/20922
2015-12-03 14:42:14 +01:00
Morris Jobke
aa0265bd34
Replace OC_Config in setup
2015-12-03 14:35:15 +01:00
Morris Jobke
cbe6eeffa1
last change of OC_Config to the proper interface in tests/
2015-12-03 14:03:05 +01:00
Thomas Müller
2d1cc8aaeb
Merge pull request #19461 from owncloud/reuse_code
...
reuse code
2015-12-03 13:55:50 +01:00
Sergio Bertolin
c744b30b3b
Changed fail for assertEquals and removed fields which weren't checked
2015-12-03 12:54:44 +00:00
Morris Jobke
542ce7dd0d
Reduce OC_Config usage in tests/
2015-12-03 13:48:19 +01:00
Robin Appelman
19b2fe6a3a
Fix mimetype filter in getDirectoryContent
2015-12-03 13:09:13 +01:00
Thomas Müller
e62b6c1617
Merge pull request #20729 from owncloud/issue_20599
...
Add different storage status error codes managed by StoragedNotAvailableExc…
2015-12-03 12:30:38 +01:00
Thomas Müller
3a391e4cc9
Merge pull request #20916 from owncloud/integration_test_download_public_share_by_range
...
Added test case about downloading by range a public shared file
2015-12-03 12:30:10 +01:00
Sergio Bertolin
b17553d921
Added test case about downloading by range a public shared file
2015-12-03 10:58:31 +01:00
Lukas Reschke
0d6f02bac9
Merge pull request #20914 from owncloud/drop-more-OC_Config-from-tests
...
Replace more of OC_Config in tests with IConfig calls
2015-12-03 10:49:12 +01:00
Jesús Macias
9dd11091d4
Fix code from comments
2015-12-03 10:00:11 +01:00
Jesús Macias
f4f53e328d
Fix duplicate use in storage controller
2015-12-03 10:00:01 +01:00
Jesús Macias
98f5c50aa4
Migrate storate status code to storagenotavailablexception
2015-12-03 09:59:45 +01:00
Jesús Macias
4ead2bc861
Fix code from PR comments
2015-12-03 09:58:55 +01:00
Jesús Macias
9d1ec02c5a
Change exception catch order
2015-12-03 09:58:30 +01:00
