c0edb639ed
adjust test
2013-12-13 16:58:23 +01:00
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
dcfda5c2a9
coding style
2013-12-13 16:58:09 +01:00
91d6a6dd7c
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-13 16:58:03 +01:00
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
1292793c4b
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
2013-12-13 16:29:42 +01:00
ad998c1fb5
Merge pull request #6390 from owncloud/migration-fixwebroot
...
Fix webroot for update page
2013-12-13 05:35:29 -08:00
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
7b30ffbf23
Merge pull request #6318 from owncloud/gethome-cache
...
cache the home folder of a User
2013-12-13 01:30:43 -08:00
600655b0f9
Merge pull request #6347 from owncloud/cache-test-utf8
...
Add test for having utf8 filenames in the cache
2013-12-13 01:27:13 -08:00
9842890ed7
Update 3rdparty ref
2013-12-13 00:05:00 +01:00
27d9af36db
Merge pull request #6356 from owncloud/fix_6353
...
[trashbin] toggle select all checkbox
2013-12-12 09:03:11 -08:00
fc13b9802e
update 3rdparty
2013-12-12 17:56:16 +01:00
b47e4378d2
Merge pull request #6302 from owncloud/mysql-set-names-utf8
...
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-12 08:46:43 -08:00
79719d9ae5
toggle select all checkbox
2013-12-12 17:33:04 +01:00
46b72cbff0
remove unneeded ; in comment
2013-12-12 15:14:44 +01:00
5ba9344b0e
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
2013-12-12 14:15:39 +01:00
30e0b474f8
Add test for having utf8 filenames in the cache
2013-12-12 13:43:55 +01:00
f23b7a262f
fix fallback overwriting result of getHome
2013-12-12 12:57:25 +01:00
7b20212c0a
[tx-robot] updated from transifex
2013-12-11 13:32:13 -05:00
366d75e947
cache the home folder of a User
2013-12-11 16:22:26 +01:00
050f87c9e4
Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix
...
Fixed sharing results to include the correct permissions
2013-12-11 02:59:22 -08:00
cdd182ce35
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-11 00:19:51 +01:00
28180485d9
Merge pull request #6244 from owncloud/memcached-connectivity-tests
...
Only run memcached tests if server is available.
2013-12-10 12:14:36 -08:00
22abc53e3b
Merge pull request #5968 from owncloud/legacy-popup-fixes
...
fix the legacy popup to make calendar settings look nicer
2013-12-10 05:37:52 -08:00
e9255e5d57
Added unit test for sharing permissions
2013-12-10 11:19:09 +01:00
89eb3759a8
Fixed sharing results to include the correct permissions
...
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.
Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.
Fixes #6265
2013-12-09 18:14:58 +01:00
3084a52a97
Merge pull request #6246 from owncloud/memcached-config-sample
...
Document memcached settings in config.sample.php
* owncloud/memcached-config-sample:
Document memcached settings in config.sample.php
2013-12-09 14:35:00 +01:00
67310b60f7
Ensure memcached extension is there before attempting to create an instance.
2013-12-09 14:33:26 +01:00
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
e574158bd8
fix shadow size and arrow position
2013-12-09 12:21:37 +01:00
bc3650e48c
Merge pull request #6231 from owncloud/fix-plural-l10n
...
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
5db73c05fb
Document memcached settings in config.sample.php
2013-12-09 01:20:10 +01:00
a67c737848
Only run memcached tests if server is available.
2013-12-09 01:02:42 +01:00
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
823c85e65f
Merge pull request #6202 from owncloud/fix_6032_alt
...
Add overlay noscript message to fix #6032
2013-12-07 08:04:29 -08:00
3444c15b86
fix IE8 transparent background
2013-12-07 17:03:53 +01:00
67957294c2
fix wrong test data in l10n
2013-12-07 13:29:14 +01:00
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
6a747106db
Merge pull request #6150 from owncloud/backgroundjob-log-exception
...
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
123bc9921a
Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
...
reuse etags when doing a background scan
2013-12-06 10:13:14 -08:00
575a68074f
Merge pull request #6220 from owncloud/debug_oracle_errors
...
cherry-picks from #5884 , just for debugging purpose
2013-12-06 10:00:04 -08:00
9eca2471b3
Merge branch 'master' into backgroundscan-reuse-etag
2013-12-06 18:27:46 +01:00
e888bdda30
get rid of failing test that don't cause additional downloads
2013-12-06 18:26:38 +01:00
4c8bc61753
XSendfile and encryption don't work together
...
The file on disk is encrypted, and not readable on client systems
2013-12-06 17:59:59 +01:00
b5939324b0
Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode
...
correctly propagate the return value of ldap_set_option
2013-12-06 08:54:29 -08:00
36c286f879
Merge pull request #6222 from owncloud/enc_reset_enc_file_size
...
set unencrypted_size to 0 after decryption
2013-12-06 08:06:22 -08:00
40f148cc6c
Don't try to encrypt a file when the temp file isn't created
2013-12-06 17:01:13 +01:00
9ff231590c
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 16:11:41 +01:00
6aa9daf4e6
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 15:51:49 +01:00
Arthur Schiwon
Jörn Friedrich Dreyer
Vincent Petry
Thomas Müller
Owen Winkler
Bjoern Schiessle
Robin Appelman
Andreas Fischer
Jan-Christoph Borchardt
Morris Jobke
Björn Schießle
Bart Visscher