958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +07:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 +07:00
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 +07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 +07:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +07:00
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 +07:00
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +07:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 +07:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 +07:00
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +07:00
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 +07:00
aba64a0b81
Class Auto Loader: Cache paths in APC
...
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
2013-08-18 12:29:43 +07:00
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +07:00
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 +07:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +07:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +07:00
5c9aedac1b
remove outdated quota proxy
2013-08-16 15:50:50 +07:00
8f10c9571f
fix quota wrapper reporting negative free_space, breaking user interface
...
return 0 instead
2013-08-16 15:48:45 +07:00
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 +07:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 +07:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +07:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +07:00
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +07:00
3972198b61
Cache OC_Util::checkServer() result in session
...
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +07:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 +07:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 +07:00
6c3efaf26c
throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files
2013-08-14 09:44:29 +07:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +07:00
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +07:00
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 +07:00
43be3eb4d0
Changing elseif statement to what the PEAR coding guidelines say.
2013-08-09 22:32:38 +07:00
9c22046bff
Do not pass numeric strings to strtotime() when formatting dates.
...
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
2013-08-09 22:32:38 +07:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +07:00
4c0ec974b9
Merge pull request #4344 from owncloud/appmgmt-in-navigation
...
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 +07:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 +07:00
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 +07:00
e38025ba67
Merge pull request #4151 from owncloud/doctrine-object
...
Move dbtype depending logic into object per type
2013-08-08 08:46:30 +07:00
c24bf47db8
Merge pull request #4349 from owncloud/oc_cache_fix
...
oc_cache needs to disable file proxys for read/write operation.
2013-08-08 08:19:14 +07:00
062769ab61
Remove noisy Log/Debug message
2013-08-08 16:39:33 +07:00
df358dfef5
fix function call for searUsers()
2013-08-08 13:41:04 +07:00
ab6e47b44a
oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
2013-08-08 09:44:19 +07:00
d563367b0f
More style fixes
2013-08-07 22:22:33 +07:00
83988a5906
Fix stupid bug
2013-08-07 21:01:31 +07:00
0783267e2c
Move query processing after the check for prepared statement cache
2013-08-07 18:21:49 +07:00
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +07:00
2cc94cbc73
Style fixes
2013-08-07 18:17:37 +07:00
a0243e03ef
use ===
2013-08-07 17:17:30 +07:00
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +07:00
fc332acf8a
split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
2013-08-07 16:38:57 +07:00
Arthur Schiwon
Jenkins for ownCloud
Georg Ehrke
icewind1991
Robin Appelman
Björn Schießle
Kondou
Thomas Tanghus
Markus Goetz
Bjoern Schiessle
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Andreas Fischer
Owen Winkler
Morris Jobke
Bart Visscher