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 |
Bart Visscher
|
311c2bc0d3
|
Calendar: Write-close session to enable parallel events.php requests
|
2012-06-19 23:18:26 +02:00 |
Bart Visscher
|
0524f6fd3c
|
Fix webdav property name compare
|
2012-06-19 23:18:07 +02:00 |
Bart Visscher
|
2d4e1b45ce
|
Load app before running update script
|
2012-06-19 23:17:40 +02:00 |
Bart Visscher
|
c260db0e9a
|
Tasks: Fix resizing of the content part
|
2012-06-19 23:17:14 +02:00 |
Bart Visscher
|
0d43d6402d
|
Tasks: Use POST for ajax calls that change data
|
2012-06-19 23:17:00 +02:00 |
Bart Visscher
|
cff1b6e699
|
Don't use substr to get first char of string
|
2012-06-19 23:16:17 +02:00 |
Bart Visscher
|
bb649dd0d5
|
Smarter code for OC_FileProxy
Conflicts:
lib/fileproxy.php
|
2012-06-19 23:15:33 +02:00 |
Bart Visscher
|
598a090db4
|
Add cache for getStorage and getInternalPath functions.
These are called for almost every file operation.
|
2012-06-19 23:13:24 +02:00 |
Bart Visscher
|
e728635c8a
|
Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
Speeds up access of directories with large number of files.
|
2012-06-19 23:13:21 +02:00 |
Bart Visscher
|
4d627d66a1
|
Add help texts to config options in config.sample.php
|
2012-06-19 23:11:54 +02:00 |
Bart Visscher
|
98bc916016
|
Make check for writable apps dir configurable
Conflicts:
config/config.sample.php
|
2012-06-19 23:11:14 +02:00 |
Bart Visscher
|
f54ef5a464
|
Remove OC::$CONFIG_DATADIRECTORY, not used
|
2012-06-19 22:54:14 +02:00 |
Bart Visscher
|
d8b32c2f0e
|
Move check code from setupFS to checkServer
|
2012-06-19 22:54:13 +02:00 |
Thomas Mueller
|
637f8398ba
|
fixes oc-668
|
2012-06-19 22:37:25 +02:00 |
Sam Tuke
|
28a72e0e3c
|
Fixed deleteAll function for deleting all old versions of files (expireAll)
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
|
2012-06-19 19:42:40 +01:00 |
Bjoern Schiessle
|
f11e4d7cd6
|
removing sanitizeHTML() function from template.php since I moved it to util.php
to make it more generic.
|
2012-06-19 19:29:43 +02:00 |