Jörn Friedrich Dreyer
|
86c3f9b8fe
|
Merge branch 'master' of github.com:owncloud/core
|
2012-09-10 14:14:49 +02:00 |
Jörn Friedrich Dreyer
|
db7a18455f
|
use tabs for indentation
|
2012-09-10 14:14:36 +02:00 |
Thomas Müller
|
5a65c5a46c
|
Respect coding style
|
2012-09-10 14:59:08 +03:00 |
Thomas Müller
|
0444877218
|
Respect coding style
|
2012-09-10 12:35:15 +03:00 |
Thomas Müller
|
c6cd1b77d3
|
Respect coding style
|
2012-09-10 12:32:49 +03:00 |
Thomas Müller
|
5721bd2786
|
Respect coding style
|
2012-09-10 12:31:57 +03:00 |
Thomas Müller
|
1a10955644
|
Respect coding style
|
2012-09-10 12:29:35 +03:00 |
Thomas Müller
|
2271a97992
|
Respect coding style
|
2012-09-10 12:28:09 +03:00 |
Thomas Müller
|
9a2bc5255b
|
Respect coding style
|
2012-09-10 12:26:20 +03:00 |
Thomas Müller
|
23f348c99f
|
Respect coding style
|
2012-09-10 12:25:42 +03:00 |
Thomas Müller
|
87e1a27fde
|
Respect coding style
|
2012-09-10 12:23:55 +03:00 |
Thomas Müller
|
f34588d1ff
|
Respect coding style
|
2012-09-10 12:21:54 +03:00 |
Michael Gapczynski
|
6c17a4cb77
|
Don't display actions for children in shared collections, show the parent collection the child is shared in
|
2012-09-09 14:44:08 -04:00 |
Michael Gapczynski
|
13d513c17c
|
Fix shared collection item searching
|
2012-09-09 11:50:12 -04:00 |
Michael Gapczynski
|
3e7951e1e6
|
Normalize the file path for shared children as a precaution
|
2012-09-08 23:42:24 -04:00 |
Michael Gapczynski
|
fe7f095b08
|
Insert id for unique user group share rows
|
2012-09-08 23:09:58 -04:00 |
Michael Gapczynski
|
b163bd514f
|
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
|
2012-09-08 23:09:57 -04:00 |
Michael Gapczynski
|
f23f719d99
|
Fix unsharing from self for group shares and add test for it
|
2012-09-08 20:15:47 -04:00 |
Jenkins for ownCloud
|
5e790368bc
|
[tx-robot] updated from transifex
|
2012-09-09 02:03:35 +02:00 |
Robin Appelman
|
46422e6dbe
|
don't use regular expresions for a simple string replace
|
2012-09-08 23:40:23 +02:00 |
Robin Appelman
|
697061fa9f
|
add OC_Image::fitIn
|
2012-09-08 23:26:19 +02:00 |
Thomas Tanghus
|
abc930c57c
|
Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security.
|
2012-09-08 17:58:59 +02:00 |
Georg Ehrke
|
2b42893fa9
|
style fixes for public util api
|
2012-09-08 16:18:47 +02:00 |
Georg Ehrke
|
89f3afe2fe
|
style fixes for public user api
|
2012-09-08 16:17:01 +02:00 |
Georg Ehrke
|
439ede2a1d
|
style fixes for public response api
|
2012-09-08 16:15:42 +02:00 |
Georg Ehrke
|
a16565a7fa
|
style fixes for public json api
|
2012-09-08 16:14:06 +02:00 |
Georg Ehrke
|
89e5b85fa7
|
style fixes for public files api
|
2012-09-08 16:02:11 +02:00 |
Georg Ehrke
|
6b2b8b10ee
|
style fixes for public db api
|
2012-09-08 16:00:32 +02:00 |
Georg Ehrke
|
221257d2fb
|
style fixes for public config api
|
2012-09-08 15:58:28 +02:00 |
Georg Ehrke
|
eca24f74f7
|
style fixes for public app api
|
2012-09-08 15:54:30 +02:00 |
Georg Ehrke
|
c692dfc1ab
|
style fixes for public app api
|
2012-09-08 15:52:29 +02:00 |
Jenkins for ownCloud
|
d5d2e89622
|
[tx-robot] updated from transifex
|
2012-09-08 02:05:41 +02:00 |
Bart Visscher
|
edcd297476
|
Move handling of core remotes to OC_TemplateLayout
|
2012-09-07 16:42:46 +02:00 |
Bart Visscher
|
631df21de6
|
Prevent loading all apps twice from overwriting the core scripts and styles
|
2012-09-07 16:20:13 +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 |
Michael Gapczynski
|
6c29334b48
|
Add support for share expiration
|
2012-09-01 18:53:48 -04: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 |
Robin Appelman
|
3dacf149de
|
allow configuring user backends in config.php
|
2012-09-01 02:50:27 +02:00 |
Robin Appelman
|
f67aef608f
|
load authentication apps on login
|
2012-09-01 02:50:27 +02:00 |
Robin Appelman
|
ebd813ae95
|
don't throw errors in the autoloader when a class doesn't exist
|
2012-09-01 02:50:27 +02:00 |
Jenkins for ownCloud
|
ab090d5277
|
[tx-robot] updated from transifex
|
2012-09-01 02:04:00 +02:00 |
Michael Gapczynski
|
efa0478d2d
|
Remove share permission for encrypted files
|
2012-08-31 17:31:28 -04:00 |
Frank Karlitschek
|
72e80bf6bd
|
send the current owncloud version to the ocs server so that we can filter for compatible apps
|
2012-08-31 20:22:03 +02:00 |
Thomas Mueller
|
6f8efcfe61
|
l18n support lib/updater.php
|
2012-08-31 10:51:35 +02:00 |
Thomas Mueller
|
bd809574dc
|
fix translations within subfolder /lib
|
2012-08-31 00:43:50 +02:00 |
Thomas Mueller
|
58b1e841f1
|
fix translations within subfolder /lib
|
2012-08-30 23:51:44 +02:00 |
Robin Appelman
|
b5234a4f34
|
allow html inside app descriptions
|
2012-08-30 22:17:54 +02:00 |
Bart Visscher
|
598815b21e
|
More info about not compatible apps (app id)
|
2012-08-29 22:38:06 +02:00 |
Bart Visscher
|
c958d5ba80
|
Fix filesystem setup for shared public link with logged in user
|
2012-08-29 21:35:55 +02:00 |
Michael Gapczynski
|
301baf0215
|
$storage shouldn't be static in OC_Cache_File
|
2012-08-29 14:42:40 -04:00 |
Michael Gapczynski
|
8d490b9880
|
Fix shared storage working with user backend defined data directories
|
2012-08-29 14:39:13 -04:00 |
Bart Visscher
|
db18218a1b
|
Space before tab fixes
|
2012-08-29 20:34:44 +02:00 |
Bart Visscher
|
9e32e07306
|
Fix OC_Cache_File
|
2012-08-29 20:29:43 +02:00 |