e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
d896c19011
cal import should group events by uid, export should have correct newlines, fix for oc-384
2012-03-31 20:16:42 -07:00
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
360778e520
use backslash n instead of a real new line
2012-01-15 00:56:11 +01:00
43f7b2fd2d
fix newline problem in calendar
2012-01-15 00:45:27 +01:00
3e2e5196d2
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
...
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
2011-12-27 22:18:01 +01:00
ff346ad135
Calendar: small for loop fix
2011-12-18 23:10:43 +01:00
4eb36b0ecf
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
58d1a3516a
Removed some debug statements.
...
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
c86d1824fe
Improve handling of calendar export $_GET params
...
* a notice would be reported if either of the 'cal' or 'event' $_GET params
where not supplied, which would result in 'Cannot modify header information'
warnings
2011-10-12 15:23:39 +11:00
0ebe9ad70c
added function to export single events
2011-10-01 23:19:06 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
782069e1fa
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
388b14604a
Move Calendar Object code to its own class OC_Calendar_Object
2011-09-16 00:19:43 +02:00
8cdd9ab81b
export function and style fixes in calendar
2011-09-02 12:55:56 +02:00
Georg Ehrke
Scott Shambarger
Bart Visscher
Thomas Tanghus
John Kristensen
Georg Ehrke
Bart Visscher