wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4950 commits 157 branches 562 tags 714 MiB
Commit graph

634 commits

Author SHA1 Message Date
Bjoern Schiessle
8c28aec664 date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:30:40 +02:00
Bart Visscher
fd23c286ef Calendar: Fix caldav url encoding 2012-06-21 23:30:04 +02:00
Bart Visscher
4a22f4ca78 Calendar: convert choosecalendar.rowfields template from plain php to html+php 2012-06-21 23:30:04 +02:00
Bart Visscher
1d07b9e291 Calendar: Missing userid in allCalendars call 2012-06-21 23:30:04 +02:00
Bart Visscher
c047fdafdb Calendar: Fix missing template parameter 'shared' for new and update calendar 2012-06-21 23:30:04 +02:00
Brice Maron
a5938e4e37 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Thomas Tanghus
b17bf59ced Only search for VEVENTs. 2012-06-21 20:51:23 +02:00
Brice Maron
e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Georg Ehrke
49d9eb7acf fix calendar 2012-06-21 16:24:05 +02:00
Georg Ehrke
f5740a6f92 fix a PHP Notice 2012-06-21 15:20:15 +02:00
Georg Ehrke
1db2539223 make edit event form work with DateTime Property UTC 2012-06-21 11:35:20 +02:00
Bart Visscher
fedfa4c98e DateTime objects are directly comparable 2012-06-20 21:38:56 +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
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
13aad8f06d some little fixes for repeating events caching 2012-06-18 15:58:01 +02:00
Georg Ehrke
beed6e0f0e Revert "Revert "create OC_Calendar_Object::generateStartEndDate function"" 
This reverts commit e3b58f6783.
 2012-06-18 14:47:58 +02:00
Georg Ehrke
e3b58f6783 Revert "create OC_Calendar_Object::generateStartEndDate function" 
This reverts commit aa7ce480f4.
 2012-06-18 14:47:09 +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
aa7ce480f4 create OC_Calendar_Object::generateStartEndDate function 2012-06-15 12:11:22 +02:00
Georg Ehrke
4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Georg Ehrke
22a33b509f use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod 2012-06-15 11:39:19 +02:00
Georg Ehrke
e4529301ff change some function names in OC_Calendar_Repeat 2012-06-15 11:34:21 +02:00
Georg Ehrke
5c10683432 use easier parseable date to init datetime 2012-06-15 11:29:16 +02:00
Georg Ehrke
6f20d51646 fix generateEventOutput for calendar hook 2012-06-15 11:25:29 +02:00
Georg Ehrke
b6a8de8530 don't clean and cache calendar on every update 2012-06-15 11:24:40 +02:00
Thomas Tanghus
f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus
3c75ac5f62 Update calendar after delete. 2012-06-15 02:07:32 +02:00
Thomas Tanghus
ad8c4ab182 Only create new calendar when there are none. Fix oc-1007. 2012-06-15 01:55:02 +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
1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Thomas Tanghus
31db583f03 Make events show again. 2012-06-15 00:26:34 +02:00
Brice Maron
4753cc3ebd Merge branch 'master' into multi_app_dir 
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
 2012-06-14 21:16:59 +00:00
Georg Ehrke
e154806838 fix another ui bug of calendar 2012-06-13 22:20:43 +02:00
Georg Ehrke
2e44ffaf02 another ui fix 2012-06-13 22:14:40 +02:00
Georg Ehrke
b1139e977a fix a ui bug for calendar sharing 2012-06-13 22:12:54 +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
7d29bee859 fix merge conflicts 2012-06-13 21:40:05 +02:00
Bart Visscher
7a8e7f18db Calendar: Clicking #datecontrol_date gives datepicker to jump to date 2012-06-13 21:39:12 +02:00
Bart Visscher
4da6b3a391 Calendar: Make button of #datecontrol_date 2012-06-13 21:39:12 +02:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00