13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
6e8bc13aa3
fix weird logical behaviour
2013-08-27 10:58:17 +02:00
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +02:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
1e4ebf47e2
webdav quota now displays the same values as the web interface does
2013-08-27 00:57:28 +02:00
d1a6d2bc8f
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
2013-08-26 20:21:16 +02:00
7d141656ee
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
...
Conflicts:
lib/helper.php
2013-08-26 18:04:49 +02:00
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
81a45cfcf1
fixes #4574
2013-08-26 15:16:41 +02:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
58c727a495
fix return value of method
2013-08-23 23:27:36 +02:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
8dd93c8c02
Fix some phpdoc and camelcase
2013-08-23 07:30:42 +02:00
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +02:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
1c258087c9
fixing typos
2013-08-22 01:20:28 +02:00
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +02:00
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +02:00
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02: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 -04:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02: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
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02: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 +02:00
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
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 +02:00
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02: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 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
d43b4c52ae
also emit hooks for views that are a subfolder of the user folder
2013-08-17 10:57:31 +02:00
5c9aedac1b
remove outdated quota proxy
2013-08-16 15:50:50 +02:00
8f10c9571f
fix quota wrapper reporting negative free_space, breaking user interface
...
return 0 instead
2013-08-16 15:48:45 +02: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 -04:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
4574c5cf5c
check if ->resource is a resource
2013-08-15 16:13:01 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
7a11911aea
add comment to make @jancborchardt happy
2013-08-15 13:25:45 +02:00
825d8610d0
fix svg and cache transparency issue
2013-08-15 13:22:05 +02:00
7fe9320ffe
improve unknown backend
2013-08-15 13:22:04 +02: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 +02:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
623f9ec817
don't generate previews of empty txt files
2013-08-14 21:20:31 +02:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
e5761d90ef
fix deleting old previews after file changed
2013-08-14 20:49:47 +02:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02: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 +02:00
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
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +02:00
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
43be3eb4d0
Changing elseif statement to what the PEAR coding guidelines say.
2013-08-09 22:32:38 +02: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 +02:00
b24b208dce
Throw exceptions instead of only logging in \OC_Installer::installApp()
2013-08-09 21:57:01 +02:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02: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 -04:00
1c9d52774e
update indexes of oc_permissions
2013-08-09 09:31:53 +02:00
881e362f93
final fix for xsendfile zip generation race condition
2013-08-08 23:34:04 +02: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 +02:00
df358dfef5
fix function call for searUsers()
2013-08-08 13:41:04 +02:00
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02: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 +02:00
fb890eee67
fixes #4343
2013-08-08 00:42:28 +02:00
d563367b0f
More style fixes
2013-08-07 22:22:33 +02:00
83988a5906
Fix stupid bug
2013-08-07 21:01:31 +02:00
0783267e2c
Move query processing after the check for prepared statement cache
2013-08-07 18:21:49 +02:00
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
2cc94cbc73
Style fixes
2013-08-07 18:17:37 +02:00
Jörn Friedrich Dreyer
blizzz
Morris Jobke
Thomas Müller
Stephane Martin
Georg Ehrke
Christopher
icewind1991
Robin Appelman
Björn Schießle
Thomas Tanghus
Markus Goetz
Bjoern Schiessle
Jan-Christoph Borchardt
Andreas Fischer
Valerio Ponte
Owen Winkler
Bart Visscher