Commit Graph

216 Commits

Author SHA1 Message Date
Lukas Reschke c04aa8d6a9 Add CSRF checks 2012-07-20 15:45:17 +02:00
Thomas Tanghus 06ff6c6d7d Added CSRF checks to Calendar. Expect some error messages - and report them ;) 2012-07-17 11:46:01 +02:00
Georg Ehrke ca5de26bac another fix for oc-1044 2012-06-24 09:41:37 +02:00
Bart Visscher c047fdafdb Calendar: Fix missing template parameter 'shared' for new and update calendar 2012-06-21 23:30:04 +02:00
Georg Ehrke 49d9eb7acf fix calendar 2012-06-21 16:24:05 +02:00
Georg Ehrke 1db2539223 make edit event form work with DateTime Property UTC 2012-06-21 11:35:20 +02:00
Georg Ehrke 0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Bjoern Schiessle 5a2c93ec2d use sanitizeHTML() function 2012-06-20 15:11:14 +02:00
Georg Ehrke fd9a4f8d51 Merge branch 'master' into calendar_repeat 2012-06-16 09:48:43 +02:00
Georg Ehrke 31ec93bd00 remove a lot of closing php tags and empty lines at a file's end in calendar app 2012-06-16 09:45:17 +02:00
Georg Ehrke 05c1afd0d1 Merge branch 'master' into calendar_repeat 2012-06-16 09:41:31 +02:00
Georg Ehrke b6375e7a8c remove a closing php tag in calendar 2012-06-16 09:40:03 +02:00
Georg Ehrke a6531d0311 Merge branch 'master' into calendar_repeat 2012-06-16 09:35:53 +02:00
Bart Visscher 4268fe61ba Calendar: Write-close session to enable parallel events.php requests 2012-06-16 00:44:23 +02:00
Georg Ehrke 4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Thomas Tanghus ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus 6d43e6565e Revert "Agree on argument type."
This reverts commit 0f6b1be0e6.
2012-06-15 00:53:13 +02:00
Thomas Tanghus 0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Thomas Tanghus 31db583f03 Make events show again. 2012-06-15 00:26:34 +02:00
Georg Ehrke 6bd80d6457 show username of the body who shares in the summary 2012-06-13 22:07:23 +02:00
Georg Ehrke 3c9be43aa4 add some information about repeating events caching on personal settings page 2012-06-11 22:16:26 +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 28ab92ee76 make use of post instead of get 2012-06-09 14:41:26 +02:00
Georg Ehrke 65cd15ca15 fix merge conflicts 2012-06-08 11:21:55 +02:00
Thomas Tanghus ca0108aabf Corrected typos. 2012-06-06 11:50:49 +02:00
Georg Ehrke 2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Bart Visscher 091b343d5c Calendar & Contacts: Store import progress in OC_Cache
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Georg Ehrke 46b3b30d46 add status
file for repeating events caching
2012-06-01 13:47:48 +02:00
Georg Ehrke e75146a811 Merge branch 'master' into calendar_repeat 2012-06-01 11:40:39 +02:00
Bart Visscher 2ae58ee6c0 Calendar: small cleanup of import progress writing 2012-05-31 13:01:30 +02:00
Georg Ehrke 482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke 75afc09b9d fix status
of timezone detection
2012-05-29 13:14:05 +02:00
Georg Ehrke ad66bb9c84 Merge branch 'calendar_dropimport' 2012-05-19 18:58:24 +02:00
Georg Ehrke 07fa8da278 fix for calendar 2012-05-19 15:05:58 +02:00
Georg Ehrke 38b93653a1 Merge branch 'master' into calendar_dropimport 2012-05-17 22:17:06 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Georg Ehrke 18c8896b3c better user permission check for files in ajax/calendar/ 2012-05-14 15:59:06 +02:00
Georg Ehrke 9c8eb104b6 check user permissions in calendar's changepermission.php 2012-05-14 15:42:16 +02:00
Georg Ehrke 55eb318265 check user permissions in calendar's unshare.php 2012-05-14 15:42:16 +02:00
Georg Ehrke 62a86748b5 Merge branch 'master' into calendar_dropimport 2012-05-13 15:06:02 +02:00
Georg Ehrke 63a1b066bc add first version of drop import 2012-05-13 15:05:57 +02:00
Georg Ehrke f45411f79d fix another php notice 2012-05-13 12:25:26 +02:00
Georg Ehrke f6dc158d51 fix php notice and displaying of events 2012-05-13 12:02:36 +02:00
Brice Maron 4094f6f8e0 Correct undef variable mistake from prev commit 2012-05-10 19:51:03 +00:00
Brice Maron ffe5ef2268 Correct calendar loading when calendar are from hooks. fix oc-619 2012-05-10 19:36:30 +00:00
Georg Ehrke 99db3c01ee fix bug in events.php 2012-05-09 17:36:48 +02:00
Georg Ehrke cdf5d4e231 fix for previous commit 2012-05-08 08:49:14 +02:00
Georg Ehrke 0ce1cbdd14 fix calendar vulnerability 2012-05-08 08:46:27 +02:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00