Arthur Schiwon
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Jenkins for ownCloud
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Thomas Müller
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
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Georg Ehrke
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
Arthur Schiwon
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
icewind1991
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
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
Arthur Schiwon
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Björn Schießle
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
Kondou
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
Thomas Tanghus
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +02:00
kondou
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
Markus Goetz
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
Markus Goetz
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 +02:00
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
Robin Appelman
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Thomas Müller
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
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Thomas Müller
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
Robin Appelman
5c9aedac1b
remove outdated quota proxy
2013-08-16 15:50:50 +02:00
Robin Appelman
8f10c9571f
fix quota wrapper reporting negative free_space, breaking user interface
...
return 0 instead
2013-08-16 15:48:45 +02:00
Jan-Christoph Borchardt
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
Thomas Müller
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
Georg Ehrke
4574c5cf5c
check if ->resource is a resource
2013-08-15 16:13:01 +02:00
Thomas Müller
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
Georg Ehrke
7a11911aea
add comment to make @jancborchardt happy
2013-08-15 13:25:45 +02:00
Georg Ehrke
825d8610d0
fix svg and cache transparency issue
2013-08-15 13:22:05 +02:00
Georg Ehrke
7fe9320ffe
improve unknown backend
2013-08-15 13:22:04 +02:00
Markus Goetz
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 +02:00
Jenkins for ownCloud
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
Georg Ehrke
623f9ec817
don't generate previews of empty txt files
2013-08-14 21:20:31 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Georg Ehrke
e5761d90ef
fix deleting old previews after file changed
2013-08-14 20:49:47 +02:00
Jörn Friedrich Dreyer
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
Georg Ehrke
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
Bjoern Schiessle
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 +02:00
Bjoern Schiessle
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
Robin Appelman
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +02:00
Jenkins for ownCloud
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
Andreas Fischer
43be3eb4d0
Changing elseif statement to what the PEAR coding guidelines say.
2013-08-09 22:32:38 +02:00
Andreas Fischer
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 +02:00
kondou
b24b208dce
Throw exceptions instead of only logging in \OC_Installer::installApp()
2013-08-09 21:57:01 +02:00
kondou
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
kondou
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
kondou
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt
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
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Georg Ehrke
1c9d52774e
update indexes of oc_permissions
2013-08-09 09:31:53 +02:00
Valerio Ponte
881e362f93
final fix for xsendfile zip generation race condition
2013-08-08 23:34:04 +02:00
Owen Winkler
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer
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
Björn Schießle
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
Morris Jobke
062769ab61
Remove noisy Log/Debug message
2013-08-08 16:39:33 +02:00
Bjoern Schiessle
df358dfef5
fix function call for searUsers()
2013-08-08 13:41:04 +02:00
Thomas Müller
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
Thomas Müller
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02:00
Bjoern Schiessle
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 +02:00
Thomas Müller
fb890eee67
fixes #4343
2013-08-08 00:42:28 +02:00
Bart Visscher
d563367b0f
More style fixes
2013-08-07 22:22:33 +02:00
Bart Visscher
83988a5906
Fix stupid bug
2013-08-07 21:01:31 +02:00
Bart Visscher
0783267e2c
Move query processing after the check for prepared statement cache
2013-08-07 18:21:49 +02:00
Jan-Christoph Borchardt
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
Bart Visscher
2cc94cbc73
Style fixes
2013-08-07 18:17:37 +02:00
Robin Appelman
a0243e03ef
use ===
2013-08-07 17:17:30 +02:00
Robin Appelman
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
Robin Appelman
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 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
Georg Ehrke
dcc92445a0
allow permissions.user to be null as suggested by @butonic
2013-08-07 11:51:08 +02:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
Robin Appelman
95a959b10b
merge master into doctrine-object
2013-08-06 15:43:58 +02:00
Bart Visscher
9b6357e6aa
Merge pull request #4291 from owncloud/schema
...
update DB Schema class
2013-08-05 11:29:52 -07:00
Georg Ehrke
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
Georg Ehrke
554b1990e2
suppress is_file error msg
2013-08-05 14:23:30 +02:00
Thomas Müller
464afb5eca
use isset to prevent undefined index
2013-08-05 13:51:45 +02:00
Thomas Müller
d1a39ab01c
Merge pull request #4293 from owncloud/config-date
...
make log date configurable, default to iso 8601
2013-08-04 15:18:05 -07:00
Thomas Müller
b5f18111f4
Merge pull request #4308 from owncloud/fix-4194
...
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 15:16:32 -07:00
Thomas Müller
0ae2bb77ba
Merge pull request #4228 from owncloud/fix-3836
...
app migrate: Use = instead of LIKE as described in the comment above.
2013-08-04 15:00:24 -07:00
Thomas Müller
33d78ab9c7
fixing PHPDoc
2013-08-04 23:13:34 +02:00
Thomas Müller
b716d035c3
fixing PHPDoc
2013-08-04 22:58:40 +02:00
Jan-Christoph Borchardt
5a77b67147
change long couldn't be determined string to question mark again
2013-08-04 16:27:17 +02:00
Andreas Fischer
e03d9e3aa0
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 02:48:00 +02:00
Thomas Müller
b229381dda
initialize $plural_form_string with English default
2013-08-03 23:29:31 +02:00
Robin Appelman
3534c3b373
add reveal mimetype
2013-08-03 21:59:44 +02:00
Thomas Müller
e04bf0aaeb
unit tests for plural translations added
2013-08-02 23:08:41 +02:00
Thomas Müller
35a42da3ca
PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction
2013-08-02 21:46:25 +02:00
Thomas Müller
afc8ee721d
Merge pull request #4299 from owncloud/simplify-db-transaction
...
Simplify OC_DB transaction functions
2013-08-02 12:32:41 -07:00
Robin Appelman
2af27434a4
merge master into doctrine-object
2013-08-02 19:53:04 +02:00
Bart Visscher
fd317f599b
Simplify OC_DB transaction functions
2013-08-02 16:12:34 +02:00
Bart Visscher
5ffb8fac24
Use function to create schema manager
2013-08-02 16:02:33 +02:00
Thomas Müller
821a99b937
Merge pull request #4287 from Takuto88/language-config
...
Make default language configurable via config.php
2013-08-02 06:49:54 -07:00
Robin Appelman
258e54182a
remove invalid type hinting and cleanup namespaces a bit
2013-08-02 15:09:50 +02:00
Bernhard Posselt
f5c3a346b0
make log date configurable, default to iso 8601
2013-08-02 13:34:20 +02:00