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 |
Georg Ehrke
|
40e7b56783
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:15:07 +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
|
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
|
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
|
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 |
|
Bjoern Schiessle
|
8d89bba07c
|
use new sanitizeHTML() function
|
2012-06-20 12:23:26 +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
|
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 |
|
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 |
|
Bart Visscher
|
4b6f6291c5
|
Remember result of OC_User::isLoggedIn, can be very expensive to check
|
2012-06-19 17:54:19 +02:00 |
|
Bjoern Schiessle
|
089ae980c4
|
use new sanitize HTML function
|
2012-06-19 17:24:55 +02:00 |
|
Bjoern Schiessle
|
d2936bd90c
|
introducing a sanitize HTML function for the internal and the public API. This
allows to easily convert strings to HTML before displaying them on the web page
to reduce the risk of xss vulnerabilities.
|
2012-06-19 17:20:19 +02:00 |
|
Thomas Tanghus
|
0b9a48b4b6
|
Re-add missing loadhandlers() call.
|
2012-06-19 14:56:21 +02:00 |
|
Thomas Tanghus
|
33aec973df
|
Loading of contacts was placed outside of $(document).ready() function.
|
2012-06-19 14:55:14 +02:00 |
|
Georg Ehrke
|
5ce0097b6f
|
Calendar: only run ->expand if the event is repeating
|
2012-06-19 13:30:45 +02:00 |
|
Georg Ehrke
|
2b2da6fe35
|
Calendar: js fix
|
2012-06-19 13:26:55 +02:00 |
|
Georg Ehrke
|
c8c105df33
|
Calendar: fix modifying of end DateTime object
|
2012-06-19 13:04:11 +02:00 |
|
Georg Ehrke
|
a38463d41a
|
Merge branch 'master' into calendar_repeat
|
2012-06-19 11:30:12 +02:00 |
|
Georg Ehrke
|
8a8dda726c
|
Merge branch 'master' into calendar_export
|
2012-06-19 11:30:06 +02:00 |
|
Bjoern Schiessle
|
0469f529fa
|
quota calculation fixed
|
2012-06-19 09:35:13 +02:00 |
Thomas Mueller
|
c1df0539a0
|
fixes oc-668
|
2012-06-18 23:33:02 +02:00 |
Florian Hülsmann
|
c3cd3f3571
|
CSS class headerAction -> header-action
|
2012-06-18 23:22:52 +02:00 |
|
Florian Hülsmann
|
c723e1107d
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-18 23:19:15 +02:00 |
|
Florian Hülsmann
|
0132b80282
|
added CSS class .headerAction
|
2012-06-18 23:18:32 +02:00 |
|
Georg Ehrke
|
8c8a0cca75
|
Merge branch 'master' into calendar_export
|
2012-06-18 23:10:01 +02:00 |
|
Bart Visscher
|
d4044d0283
|
Delay loading of translations until they are used
|
2012-06-18 23:07:32 +02:00 |
|
Thomas Mueller
|
a1364c9726
|
fixes oc-1026
|
2012-06-18 22:48:52 +02:00 |
Brice Maron
|
cfb3b633f5
|
Force sanitize function to use UTF8 (for php lower than 5.4)
|
2012-06-18 19:52:05 +00:00 |