Georg Ehrke
|
82e8cb23fe
|
Merge branch 'master' into calendar_export
|
2012-06-21 09:08:26 +02:00 |
Michael Gapczynski
|
cc3835d657
|
Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
Conflicts:
lib/fileproxy/quota.php
|
2012-06-20 19:39:17 -04:00 |
Michael Gapczynski
|
6524f6ad30
|
Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
|
2012-06-20 19:24:45 -04:00 |
Bart Visscher
|
fedfa4c98e
|
DateTime objects are directly comparable
|
2012-06-20 21:38:56 +02:00 |
Bart Visscher
|
a6dc7345d0
|
Gallery: Move code/js/css from main template to the right place
|
2012-06-20 21:28:37 +02:00 |
Thomas Tanghus
|
10a0d5a46c
|
More changes for updating the contacts list.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
dc8c188ffe
|
Better error checking.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
426ed27be2
|
Make sure address books are shown even if empty.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
0f1fe0b505
|
Log error as ERROR.
|
2012-06-20 21:00:49 +02:00 |
Robin Appelman
|
e43d02fadb
|
fix encrypted flags not being saved correctly
|
2012-06-20 20:18:42 +02:00 |
Robin Appelman
|
9ba467d629
|
fix encryption for binary files
|
2012-06-20 20:18:42 +02:00 |
Robin Appelman
|
0f2600e9ea
|
add binary test case for encryption
|
2012-06-20 20:18:41 +02:00 |
Robin Appelman
|
e3f1507374
|
use absolute path for file proxies
|
2012-06-20 20:18:41 +02:00 |
Georg Ehrke
|
69d7c763a9
|
Merge branch 'master' into oc_error
|
2012-06-20 20:15:17 +02:00 |
Georg Ehrke
|
40e7b56783
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:15:07 +02:00 |
Georg Ehrke
|
7d0d1ebd4f
|
Merge branch 'master' into oc_error
|
2012-06-20 20:14:15 +02:00 |
Georg Ehrke
|
0f13cbb47d
|
Merge branch 'master' into calendar_repeat
|
2012-06-20 20:14:08 +02:00 |
Georg Ehrke
|
c1d205cbf5
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:14:03 +02:00 |
Arthur Schiwon
|
d0dbc8beab
|
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
|
2012-06-20 20:04:41 +02:00 |
Arthur Schiwon
|
f255ac8b3a
|
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
|
2012-06-20 20:03:25 +02:00 |
Arthur Schiwon
|
4b231c15d5
|
bookmarks: make read later-button draggable again, fixes oc-944
|
2012-06-20 19:43:02 +02:00 |
Sam Tuke
|
72215a818d
|
added new user settings interface for deleting old file versions
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
|
2012-06-20 18:25:12 +01:00 |
Sam Tuke
|
d6bf62ea4e
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-20 16:26:02 +01:00 |
Sam Tuke
|
c244daac89
|
removed readdir to fix bug oc-1054
|
2012-06-20 16:24:49 +01:00 |
Bart Visscher
|
6308ca6b8a
|
Merge branch 'shared_log'
|
2012-06-20 17:20:46 +02:00 |
Bart Visscher
|
0086639891
|
Merge branch 'audit'
|
2012-06-20 17:20:39 +02:00 |
Bart Visscher
|
7a3d606cac
|
Prefer requested app before redirecting to default page
|
2012-06-20 17:10:49 +02:00 |
Bart Visscher
|
6404476bec
|
Delay setup of FS until OC_Filesystem is used
|
2012-06-20 17:10:49 +02:00 |
Bart Visscher
|
cd934d5d89
|
Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible
|
2012-06-20 17:10:49 +02:00 |
Bart Visscher
|
5c8e774cea
|
Small code reorder
|
2012-06-20 17:10:48 +02:00 |
Bjoern Schiessle
|
5cc75ad818
|
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
|
2012-06-20 17:08:48 +02:00 |
Bjoern Schiessle
|
e71dffcdf0
|
no need to escape the title
|
2012-06-20 17:01:07 +02:00 |
Bjoern Schiessle
|
8e427d80d3
|
use sanitizeHTML() function
|
2012-06-20 17:00:55 +02:00 |
Bjoern Schiessle
|
0e61b5457b
|
use new sanitizeHTML() function
|
2012-06-20 17:00:33 +02:00 |
Bjoern Schiessle
|
902c649dad
|
use new sanitize HTML function backported
Conflicts:
lib/template.php
|
2012-06-20 16:59:51 +02:00 |
Bjoern Schiessle
|
d9607df26f
|
backport of sanitizeHTML() function
|
2012-06-20 16:43:31 +02:00 |
Arthur Schiwon
|
a7f0811829
|
bookmarks: make read later-button draggable again, fixes oc-944
|
2012-06-20 16:31:22 +02:00 |
Bjoern Schiessle
|
6644511124
|
remove unnecessary comment
|
2012-06-20 16:29:19 +02:00 |
Bjoern Schiessle
|
e52230d11c
|
no need to escape the title
|
2012-06-20 15:41:05 +02:00 |
Bjoern Schiessle
|
5a2c93ec2d
|
use sanitizeHTML() function
|
2012-06-20 15:11:14 +02:00 |
Georg Ehrke
|
a054541df4
|
Merge branch 'master' into oc_error
|
2012-06-20 13:29:17 +02:00 |
Georg Ehrke
|
572dd9fbad
|
Merge branch 'master' into calendar_repeat
|
2012-06-20 13:29:12 +02:00 |
Georg Ehrke
|
27c995230c
|
Merge branch 'master' into calendar_export
|
2012-06-20 13:28:30 +02:00 |
Bjoern Schiessle
|
1ecbf459c9
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-20 13:01:55 +02:00 |
Arthur Schiwon
|
5b02217906
|
forgotten $, incorrect subtract
|
2012-06-20 12:47:31 +02:00 |
Arthur Schiwon
|
7c6b8475eb
|
LDAP: only map users within the User Base Tree
|
2012-06-20 12:47:24 +02:00 |
Arthur Schiwon
|
0289f442a8
|
forgotten $, incorrect subtract
|
2012-06-20 12:41:30 +02:00 |
Bjoern Schiessle
|
8d89bba07c
|
use new sanitizeHTML() function
|
2012-06-20 12:23:26 +02:00 |
Robin Appelman
|
c4d1363419
|
don't show other users file if the filesystem is not index already
|
2012-06-20 11:35:45 +02:00 |
Robin Appelman
|
13a9ef36fb
|
don't show other users file if the filesystem is not index already
|
2012-06-20 11:34:17 +02:00 |