Bart Visscher
|
5eba579827
|
Merge branch 'master' into routing
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
|
2012-09-07 15:51:44 +02:00 |
|
Thomas Mueller
|
3829460ab8
|
adding space between) and {
|
2012-09-07 15:22:01 +02:00 |
|
Bart Visscher
|
285c198c36
|
EOL fixes
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
|
2012-09-07 14:10:00 +02:00 |
|
Bart Visscher
|
5e55b4d6e7
|
Whitespace fixes in lib
|
2012-09-07 14:08:29 +02:00 |
|
Bart Visscher
|
386d1ac49f
|
Fix setEtagHeader function
|
2012-09-07 13:42:22 +02:00 |
|
Bart Visscher
|
cd4b8dbacd
|
Change caching checks for minimized files
Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
|
2012-09-07 13:42:22 +02:00 |
|
Bart Visscher
|
ff42da58b9
|
Global file cache should also be able to clear with prefix
|
2012-09-07 13:42:22 +02:00 |
|
Bart Visscher
|
9ea7817a40
|
Remove core.{css,js} cache on upgrade
|
2012-09-07 13:42:22 +02:00 |
|
Michael Gapczynski
|
73d726d1b2
|
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
|
2012-09-07 00:02:22 -04:00 |
|
Jenkins for ownCloud
|
a94b56b57b
|
[tx-robot] updated from transifex
|
2012-09-07 02:07:22 +02:00 |
|
Frank Karlitschek
|
294cff27a7
|
add check for zlib
|
2012-09-07 01:39:11 +02:00 |
|
Robin Appelman
|
d4fd47d43f
|
clear user filecache after the user mount configuration has changed
|
2012-09-06 23:14:43 +02:00 |
|
Robin Appelman
|
2144b2f37a
|
clear the filecache if the mount configuration has changed
|
2012-09-06 23:10:33 +02:00 |
|
Bart Visscher
|
39577495e1
|
Add a directory separator to filter app directories with the same
prefix.
Fixes: oc-1663
|
2012-09-06 22:27:56 +02:00 |
|
Michael Gapczynski
|
837eb1871d
|
Don't delete the file anymore to replace it in the UI, just overwrite it
|
2012-09-05 22:13:50 -04:00 |
|
Jenkins for ownCloud
|
af3e767489
|
[tx-robot] updated from transifex
|
2012-09-06 02:06:37 +02:00 |
|
Thomas Mueller
|
ebb28412ca
|
no more require_once()
|
2012-09-05 23:28:59 +02:00 |
|
Thomas Müller
|
24977d0fd0
|
Respect coding style
|
2012-09-05 15:49:42 +03:00 |
|
Thomas Müller
|
e5cb638c09
|
Respect coding style
|
2012-09-05 15:42:06 +03:00 |
|
Thomas Müller
|
d5fd5cd584
|
Respect coding style
|
2012-09-05 15:40:21 +03:00 |
|
Thomas Müller
|
9eccc0121a
|
Respect coding style
|
2012-09-05 13:22:38 +03:00 |
|
Jenkins for ownCloud
|
e8fcc71129
|
[tx-robot] updated from transifex
|
2012-09-05 02:05:39 +02:00 |
|
Thomas Mueller
|
1e2d582123
|
fixing button to add additional site
|
2012-09-04 23:42:49 +02:00 |
|
Bart Visscher
|
41f135daee
|
Remove () from return statement
|
2012-09-04 21:27:36 +02:00 |
|
Thomas Müller
|
69ee842521
|
Fixing: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617
|
2012-09-04 17:13:34 +03:00 |
|
Thomas Müller
|
7901fc33a8
|
fixing syntax error
|
2012-09-04 15:54:38 +03:00 |
|
Thomas Müller
|
aff08925c1
|
fixing syntax error - sorry for that
|
2012-09-04 15:46:43 +03:00 |
|
Thomas Müller
|
2028500c0a
|
fixing syntax error - sorry for that
|
2012-09-04 15:42:58 +03:00 |
|
Thomas Müller
|
e4e0b5a822
|
Respect coding style
|
2012-09-04 15:34:09 +03:00 |
|
Thomas Müller
|
d14f8fa681
|
Respect coding style
|
2012-09-04 15:21:52 +03:00 |
|
Thomas Müller
|
9760b5e153
|
Respect coding style
|
2012-09-04 13:32:27 +03:00 |
|
Jenkins for ownCloud
|
b867b738e8
|
[tx-robot] updated from transifex
|
2012-09-04 02:03:21 +02:00 |
|
Bart Visscher
|
5153b8b293
|
Add url-params to url with new parameter in linkTo function
|
2012-09-03 21:51:32 +02:00 |
|
Bart Visscher
|
1a46192433
|
Add args parameter to linkTo(Absolute) function, to append the args automaticly
|
2012-09-03 21:51:32 +02:00 |
|
Frank Karlitschek
|
bb65e173d4
|
4.5 beta 2
|
2012-09-03 20:38:50 +02:00 |
|
Jenkins for ownCloud
|
d386e0172a
|
[tx-robot] updated from transifex
|
2012-09-03 02:07:40 +02:00 |
|
Michael Gapczynski
|
4c065deb55
|
Listen to post_deleteGroup hook in Share API
|
2012-09-02 20:01:09 -04:00 |
|
Michael Gapczynski
|
dc569ea300
|
Fix some warnings from Jenkins in the Share API
|
2012-09-02 19:30:01 -04:00 |
|
Michael Gapczynski
|
db37a454b3
|
Add parameter documentation
|
2012-09-02 18:29:55 -04:00 |
|
Michael Gapczynski
|
f0f2d93908
|
Restructure generateTarget for the post_addToGroup hook
|
2012-09-02 18:23:19 -04:00 |
|
Michael Gapczynski
|
a77c16371f
|
Make item targets be based off of the parent item target for reshares
|
2012-09-02 18:23:19 -04:00 |
|
Thomas Mueller
|
5f2751c672
|
in some cases no translations are loaded because $this->lang is empty not null
|
2012-09-02 14:15:03 +02:00 |
|
Robin Appelman
|
3c784ede83
|
use str_ireplace instead of duplicate str_replace
|
2012-09-02 13:58:01 +02:00 |
|
Jenkins for ownCloud
|
2bb7cb9f64
|
[tx-robot] updated from transifex
|
2012-09-02 02:02:53 +02:00 |
|
Robin Appelman
|
2508f64efe
|
set debug mode if an xdebug session is active
|
2012-09-01 20:52:13 +02:00 |
|
Jörn Friedrich Dreyer
|
2c1f732880
|
use null instead of -1 on all getUser()
|
2012-09-01 20:50:03 +02:00 |
|
Robin Appelman
|
828ca2ba36
|
translate UNIX_TIMESTAMP() into sqlite and pgsql equivilents
|
2012-09-01 20:38:14 +02:00 |
|
Robin Appelman
|
6d48f3fab8
|
we still need this for pgsql
|
2012-09-01 16:49:29 +02:00 |
|
Robin Appelman
|
a7255181ad
|
fix autoloader throwing errors for non-oc classes
|
2012-09-01 15:36:52 +02:00 |
|
Jenkins for ownCloud
|
c0c48cb3ee
|
[tx-robot] updated from transifex
|
2012-09-01 13:37:28 +02:00 |
|