Andreas Fischer
341d9caf79
xcache_unset_by_prefix() returns feedback, return it.
2013-08-15 03:36:42 +02:00
Andreas Fischer
799106db81
Clear xCache OpCode cache instead of variable cache in clearOpcodeCache().
2013-08-15 03:35:52 +02:00
Andreas Fischer
8d762f659a
Allow usage of xCache variable cache if xcache_unset_by_prefix() is present.
2013-08-15 03:34:43 +02:00
Andreas Fischer
fb2761a203
Do not define xcache_unset_by_prefix() if it does not exist.
...
The defined function is not compatible with the function provided by xcache
because it does not honor the prefix parameter. Thus defining it like this is
a bad idea.
2013-08-15 03:31:42 +02:00
Morris Jobke
de89c31f5a
Merge pull request #4302 from synchrone/master
...
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
Jan-Christoph Borchardt
b2f666c98f
fix file summary position
2013-08-14 21:26:06 +02:00
Andreas Fischer
75e9015b54
Merge pull request #4393 from owncloud/fix_4326
...
provide correct path for require_once
* owncloud/fix_4326:
use __DIR__ instead of realpath
provide correct path for require_once
2013-08-14 21:20:53 +02:00
Georg Ehrke
623f9ec817
don't generate previews of empty txt files
2013-08-14 21:20:31 +02:00
Thomas Müller
06670cef8a
Merge pull request #4304 from tripflex/lostpw-themed
...
use theme name and title for password reset
2013-08-14 12:04:40 -07:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Bjoern Schiessle
a3d009e3b5
also create root dir if it doesn't exist yet
2013-08-14 20:51:36 +02:00
Georg Ehrke
e5761d90ef
fix deleting old previews after file changed
2013-08-14 20:49:47 +02:00
Jan-Christoph Borchardt
137d644963
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 20:41:49 +02:00
Jan-Christoph Borchardt
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
Thomas Müller
994537a5b9
Merge pull request #4372 from owncloud/allow_empty_configvalue
...
allow empty configvalue in appconfig
2013-08-14 10:34:06 -07: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
a255cc6007
fix adding preview-icon to clss attribute
2013-08-14 18:52:53 +02:00
Thomas Müller
b3b2b2d64c
Merge pull request #4363 from owncloud/fix-4355
...
Send mime-type for new files
2013-08-14 09:46:10 -07:00
Bjoern Schiessle
d314729cea
use OC files API to create missing directory which should handle special chars in every environment correctly
2013-08-14 17:58:41 +02:00
Jörn Friedrich Dreyer
9da49264ea
change filelist ui updates
2013-08-14 17:49:45 +02:00
Bjoern Schiessle
7d0e9cc685
use __DIR__ instead of realpath
2013-08-14 17:15:01 +02:00
Arthur Schiwon
7b17fd2f17
LDAP: move small info text strings into tooltips
2013-08-14 16:51:38 +02:00
Arthur Schiwon
a4fc9bbe8c
LDAP: right align labels on settings page
2013-08-14 16:38:25 +02:00
Jan-Christoph Borchardt
320bf0e8c1
fix breaking error due to ... a wrong icon link. Seriously?
2013-08-14 16:19:02 +02:00
Jan-Christoph Borchardt
79a5e2a4cc
adjustments of video and web icon
2013-08-14 13:51:55 +02:00
Georg Ehrke
4f525c864d
lazy load preview icons
2013-08-14 13:27:01 +02:00
Jan-Christoph Borchardt
4845ef5ac6
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 13:01:52 +02:00
Jan-Christoph Borchardt
14003b6d96
replace different icons for code with proper ones
2013-08-14 13:00:13 +02:00
Jan-Christoph Borchardt
fc23649fa1
replace different icons for documents, spreadsheets and presentations with proper ones
2013-08-14 12:43:42 +02:00
Jan-Christoph Borchardt
5abf6ddea4
replace same but differently named package graphics with one proper one
2013-08-14 12:36:31 +02:00
Jan-Christoph Borchardt
20855add94
add more file type icons, replace old ones
2013-08-14 12:33:41 +02:00
Georg Ehrke
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
Georg Ehrke
e704c8e4dc
use web.svg instead of web.png
2013-08-14 11:51:54 +02:00
Georg Ehrke
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
Jörn Friedrich Dreyer
e1927d5bee
fix whitespace, check selected files before starting upload
2013-08-14 10:55:12 +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
kondou
4002491947
Reword a phrase
2013-08-14 06:29:19 +02:00
Jörn Friedrich Dreyer
435e63b5ee
Merge pull request #4410 from owncloud/fix_sharing_defaults
...
Fix sharing defaults
2013-08-13 15:27:24 -07:00
Jörn Friedrich Dreyer
11a404b90b
comment clarification
2013-08-14 00:25:07 +02:00
Jörn Friedrich Dreyer
ca95a475d5
use edit & reshare permission as default
2013-08-13 22:58:47 +02:00
Jörn Friedrich Dreyer
5660f99592
add PERMISSIONS_ALL summary
2013-08-13 22:58:27 +02:00
Jenkins for ownCloud
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
Bjoern Schiessle
eb0fdc8380
provide correct path for require_once
2013-08-12 17:38:57 +02:00
icewind1991
77596ace81
Merge pull request #4391 from owncloud/scanner-reuse-recursive
...
Fix recursive scanner to reusing etags
2013-08-12 08:28:23 -07: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
Bjoern Schiessle
7b1067c2a0
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
2013-08-12 16:19:08 +02:00
Robin Appelman
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +02:00
Robin Appelman
1877a42a0d
Scanner: additional tests for reusing etags during scanning
2013-08-12 15:37:15 +02:00
Bjoern Schiessle
0bab8935c9
preserve mtime if file gets encrypted/decrypted
2013-08-12 14:30:43 +02:00