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

674 commits

Author SHA1 Message Date
Georg Ehrke
be4820bbca Merge branch 'master' into calendar_export 2012-06-16 09:48:32 +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
4d392801cc Merge branch 'master' into calendar_export 2012-06-16 09:41:24 +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
Georg Ehrke
81e8ffc4ba Merge branch 'master' into calendar_export 2012-06-16 09:35:48 +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
Georg Ehrke
0dd4ea5a4f Merge branch 'master' into calendar_export 2012-06-15 10:41:06 +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
Georg Ehrke
c24752dc1d Merge branch 'master' into calendar_export 2012-06-13 21:38:33 +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
Georg Ehrke
3a8b280c06 Merge branch 'master' into calendar_export 2012-06-13 15:29:47 +02:00
Georg Ehrke
9bdad6fdbf fix merge conflicts 2012-06-13 11:40:00 +02:00
Georg Ehrke
deb2f87556 increase version of calendar app to force db upgrade 2012-06-12 19:53:26 +02:00
Georg Ehrke
dc0adbad02 increase possible size of uri in database - fix oc-140 2012-06-12 19:52:25 +02:00
Georg Ehrke
c9d408ff8c automatic cache repeating events after an update 2012-06-12 15:56:51 +02:00
Georg Ehrke
66c3ddcd74 Merge branch 'master' into calendar_repeat 2012-06-11 22:18:46 +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
08a3a4f185 fix a bug in OC_Calendar_Repeat 2012-06-11 21:43:24 +02:00
Bart Visscher
eddad8bedb Calendar: remove unused markup from #controls 2012-06-11 20:34:06 +02:00
Lukas Reschke
68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +02:00
Lukas Reschke
ad36fc8938 Fix double sanitization 2012-06-11 19:43:37 +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
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
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
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
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
c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Lukas Reschke
6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Georg Ehrke
ece1162949 use native sabredav functions to generate repeating events 2012-06-11 10:55: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
bdb76d4873 Merge branch 'master' into calendar_export 2012-06-10 18:37:16 +02:00
Georg Ehrke
e7f6f7e452 fix another XSS 2012-06-09 16:45:37 +02:00
Georg Ehrke
c9214afff8 fix XSS in Calendar 2012-06-09 16:35:35 +02:00
Georg Ehrke
2862740674 increase height of event dialog 2012-06-09 15:38:03 +02:00
Georg Ehrke
cfb9c764ca fix creation of monthly repeated events 2012-06-09 15:15:00 +02:00
Georg Ehrke
28ab92ee76 make use of post instead of get 2012-06-09 14:41:26 +02:00
Georg Ehrke
a9b561430a add hooks for events 2012-06-09 12:30:09 +02:00
Georg Ehrke
7ed30649bb add hooks for calendars 2012-06-09 12:18:25 +02:00
Georg Ehrke
cac995ee9f some more work on repeating events caching 2012-06-09 11:49:25 +02:00
Georg Ehrke
ac74d87e3e some work on repeating events caching 2012-06-08 22:22:16 +02:00
Georg Ehrke
65cd15ca15 fix merge conflicts 2012-06-08 11:21:55 +02:00
Georg Ehrke
1d93a8fcfe Merge branch 'master' into calendar_export 2012-06-08 11:20:17 +02:00
Brice Maron
cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Thomas Tanghus
e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +02:00
Brice Maron
6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00: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
Georg Ehrke
d8d558377c Merge branch 'master' into calendar_export 2012-06-06 10:11:34 +02:00
Robin Appelman
f7d221f5f0 update translations 2012-06-06 00:29:28 +02:00
Bjoern Schiessle
564b0358f9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 10:38:42 +02:00
Bjoern Schiessle
dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +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
6560f1d894 don't change events timezone and remove the DTSTART value tag 2012-06-04 12:28:05 +02:00
Georg Ehrke
c2a51d1f48 proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid 2012-06-03 14:54:53 +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
Georg Ehrke
7a8e322679 some work for repeating events caching 2012-06-01 11:30:54 +02:00
Georg Ehrke
f0bd571866 fix potential XSS 2012-05-31 20:01:12 +02:00
Bart Visscher
a33f580db1 Remove OC_App::register function 
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
 2012-05-31 13:01:30 +02:00
Bart Visscher
2ae58ee6c0 Calendar: small cleanup of import progress writing 2012-05-31 13:01:30 +02:00
Georg Ehrke
29b17672b4 a bit of work for repeating events caching 2012-05-29 19:46:17 +02:00
Georg Ehrke
482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke
a56f2dbce7 Merge branch 'master' into calendar_repeat 2012-05-29 13:16:08 +02:00
Georg Ehrke
75afc09b9d fix status 
of timezone detection
 2012-05-29 13:14:05 +02:00
Brice Maron
22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Georg Ehrke
5e7b318e42 add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke
459114b994 Merge branch 'master' into calendar_repeat 2012-05-26 22:54:24 +02:00
Georg Ehrke
a1c9191006 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00