Commit Graph

5318 Commits

Author SHA1 Message Date
Georg Ehrke 9edd40354e Merge branch 'master' into calendar_repeat 2012-06-11 19:46:12 +02:00
Lukas Reschke ad36fc8938 Fix double sanitization 2012-06-11 19:43:37 +02:00
Lukas Reschke d2a34f4b35 Fixes a issue with the log 2012-06-11 19:33:16 +02:00
Lukas Reschke 6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Lukas Reschke 2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle 1d493a70e7 replace "=0D=0A" (\r\n) with a simple "\n" in vards during import 2012-06-11 18:13:12 +02:00
Lukas Reschke 6d68b7620c Check for string 2012-06-11 18:12:46 +02:00
Bjoern Schiessle 18d19b022f Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-11 17:28:15 +02:00
Georg Ehrke 09e744b793 connect OC_Calendar_repeat to events.php 2012-06-11 17:25:03 +02:00
Georg Ehrke 009c4c9045 add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public 2012-06-11 17:15:50 +02:00
Georg Ehrke 2dd84373c1 fix bug in OC_Calendar_Repeat 2012-06-11 17:13:20 +02:00
Arthur Schiwon fcc9a5c8d4 LDAP: offer config option for Group Display Name attribute 2012-06-11 16:48:43 +02:00
Bjoern Schiessle 739589f485 make sure that contact data are always utf8 encoded to avoid encoding problems 2012-06-11 16:26:21 +02:00
Georg Ehrke 24a1ab8c15 Merge branch 'master' into calendar_repeat 2012-06-11 15:38:02 +02:00
Georg Ehrke 44e62c03e2 increase version number of calendar 2012-06-11 15:37:19 +02:00
Georg Ehrke 32b366585d some fixes for repeating events caching 2012-06-11 15:36:48 +02:00
Thomas Tanghus 4f6978c30f Redirect HTTP Auth requests to REQUEST_URI. Partial fix for http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-874 2012-06-11 15:22:58 +02:00
Thomas Tanghus 2ee809fd86 Allow same host redirects (/somepath). 2012-06-11 15:21:37 +02:00
Georg Ehrke e6c8febafc add hooks to connect calendar / event changes with OC_Calendar_Repeat 2012-06-11 15:18:46 +02:00
Georg Ehrke 5cb9d82b45 modify hooks in OC_Calendar_Calendar 2012-06-11 15:16:59 +02:00
Georg Ehrke eb3605aa63 modify hooks in OC_Calendar_Object 2012-06-11 15:15:13 +02:00
Lukas Reschke 18e44ba2f3 Some updates... 2012-06-11 15:03:45 +02:00
Georg Ehrke 01bd048bb3 remove insert id 2012-06-11 15:01:48 +02:00
Georg Ehrke 40459c8c66 some work on repeating events caching - basic class should work now :) 2012-06-11 15:00:51 +02:00
Lukas Reschke b63795ccb8 Handling arrays 2012-06-11 14:36:11 +02:00
Lukas Reschke c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Thomas Tanghus 6d9947b3ff Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:55:54 +02:00
Lukas Reschke ec4c373eaa Settings... 2012-06-11 12:48:47 +02:00
Lukas Reschke 6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Arthur Schiwon 0df67aeae9 ldap: check array for emptiness, not nullness 2012-06-11 12:26:48 +02:00
Frank Karlitschek cd16c5e479 implement a simple request token session garbage collector 2012-06-11 12:13:08 +02:00
Georg Ehrke f4c459782b Merge branch 'master' into calendar_repeat 2012-06-11 10:59:19 +02:00
Georg Ehrke ece1162949 use native sabredav functions to generate repeating events 2012-06-11 10:55:26 +02:00
Thomas Tanghus 1cb1980d62 Categories: Turned the debugging down a bit. 2012-06-11 03:05:33 +02:00
Thomas Tanghus e79e18d866 Copy/paste error. 2012-06-11 02:40:55 +02:00
Lukas Reschke 3f9b967be7 Sanitizing user input 2012-06-11 00:36:58 +02:00
Lukas Reschke f8d2e21c66 Sanitize user input 2012-06-11 00:23:35 +02:00
Lukas Reschke 27d1c1bb94 Sanitize user input 2012-06-11 00:14:28 +02:00
Lukas Reschke 9f276729c2 Using POST instead of GET. 2012-06-10 23:38:26 +02:00
Lukas Reschke 380aab470f Sanitzing user input 2012-06-10 23:16:59 +02:00
Michael Gapczynski 3c57fb935b Mount personal mount points into filesystem 2012-06-10 16:34:44 -04:00
Michael Gapczynski dd8303b975 Stop AWS SDK from looking for configuration files, forgot to include lib/cachecore 2012-06-10 16:34:44 -04:00
Thomas Tanghus 40f8419fdf Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:56:55 +02:00
Frank Karlitschek bf4626da93 prevent XSS 2012-06-10 19:52:23 +02:00
Georg Ehrke c6a03ec6d8 remove include command for when 2012-06-10 18:41:17 +02:00
Georg Ehrke ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke bdb76d4873 Merge branch 'master' into calendar_export 2012-06-10 18:37:16 +02:00
Bartek Przybylski c11f6cc3f9 fix variable name and undefined index notice 2012-06-10 17:25:50 +02:00
Bartek Przybylski 76f20eb57c fix first time image loading error 2012-06-10 13:05:00 +02:00
Thomas Tanghus f90c8738ab Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00