Georg Ehrke
|
0918fc7d91
|
fix merge conflicts
|
2012-04-21 23:21:50 +02:00 |
|
Georg Ehrke
|
74e5402711
|
fix a php notice
|
2012-04-21 22:27:19 +02:00 |
|
Georg Ehrke
|
e29ae46609
|
fix merge conflicts
|
2012-04-21 22:12:31 +02:00 |
|
Georg Ehrke
|
711aa229b8
|
Merge branch 'master' into movable_apps
|
2012-04-20 22:41:39 +02:00 |
|
Georg Ehrke
|
3706bbec1b
|
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
|
2012-04-19 20:30:58 +02:00 |
|
Georg Ehrke
|
de71842888
|
implement shared calendar activation on server side
|
2012-04-18 11:50:12 +02:00 |
|
Georg Ehrke
|
8959e0af3d
|
implement shared calendar activation on js-side
|
2012-04-18 11:39:00 +02:00 |
|
Georg Ehrke
|
7402543d3e
|
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
|
2012-04-18 09:53:54 +02:00 |
|
Georg Ehrke
|
69ee0efc0b
|
remove the require_once lib base from all (or nearly all) files
|
2012-04-17 19:31:29 +02:00 |
|
Georg Ehrke
|
77cefdedb8
|
Merge branch 'master' into sabredav_1.6
|
2012-04-15 22:28:11 +02:00 |
|
Georg Ehrke
|
dc18e65b46
|
fix merge conflicts
|
2012-04-15 22:26:55 +02:00 |
Jakob Sack
|
0b426b5e64
|
Display correct URL in caldav and carddav paths
|
2012-04-15 16:50:45 +02:00 |
|
Jakob Sack
|
9b1d6246a9
|
Remove useless, unmaintained dav.php
|
2012-04-15 16:50:44 +02:00 |
|
Georg Ehrke
|
e292b1fcdb
|
fix merge conflicts
|
2012-04-15 12:43:07 +02:00 |
Robin Appelman
|
b1bcc60d83
|
reuse OC_L10N objects
|
2012-04-14 16:44:15 +02:00 |
|
Robin Appelman
|
926b2b78fe
|
keep version numbers in their own files for faster reading
|
2012-04-14 16:29:11 +02:00 |
Bart Visscher
|
029e1aced7
|
Tasks: Update to use new categories interface
|
2012-04-14 14:55:37 +02:00 |
|
Robin Appelman
|
3babb8c22c
|
improve flexibility of search providers a bit
|
2012-04-14 11:29:54 +02:00 |
|
Georg Ehrke
|
e256ac8791
|
fix unsharing of events
|
2012-04-13 21:49:24 -04:00 |
|
Georg Ehrke
|
c65adc12d5
|
add chosen script to calendar
|
2012-04-13 21:29:51 -04:00 |
|
Georg Ehrke
|
5d4c546693
|
fix public sharing of calendars
|
2012-04-13 17:36:47 -04:00 |
|
Georg Ehrke
|
ea3499a712
|
fix class name
|
2012-04-13 17:26:34 -04:00 |
|
Georg Ehrke
|
1e0364baa8
|
check permission check in share function
|
2012-04-13 17:16:28 -04:00 |
|
Georg Ehrke
|
77a9e343aa
|
Merge branch 'master' into sabredav_1.6
|
2012-04-13 16:42:10 -04:00 |
|
Georg Ehrke
|
afcb0aee40
|
fix merge conflicts
|
2012-04-13 16:40:10 -04:00 |
|
Georg Ehrke
|
02dc343209
|
fix address of public shared calendars
|
2012-04-13 16:26:06 -04:00 |
|
Georg Ehrke
|
854eaff34f
|
hide share tab in shared events
|
2012-04-13 16:20:19 -04:00 |
|
Bart Visscher
|
4c52007996
|
Calendar: Update category list when updating/adding event
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
471e735b0c
|
Calendar: Document active parameter in allCalendars
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
7cf7d5c3dd
|
Calendar: Also set repeat options when editing a non repeating event
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
28e0d64ede
|
Calendar: Fix saving of Categories in an event
|
2012-04-13 21:13:58 +02:00 |
|
Bart Visscher
|
f9b7ed3a1f
|
Calendar: Implement rescan of Categories
|
2012-04-13 21:13:58 +02:00 |
Thomas Tanghus
|
6aee6dae6b
|
VCategories css is now in styles.css
|
2012-04-13 18:50:40 +02:00 |
|
Georg Ehrke
|
df2e788a1c
|
fix calendarid in eventform and validation of calendarid
|
2012-04-12 23:15:19 -04:00 |
|
Georg Ehrke
|
a7908ba76b
|
fix bugs in share class
|
2012-04-12 22:11:48 -04:00 |
|
Bart Visscher
|
9165b5c28e
|
Use the same category input and management as the contacts app
|
2012-04-12 23:10:49 +02:00 |
|
Bart Visscher
|
b2011bd0a0
|
Remove unused function getCategoryOptions from OC_Calendar_Object
|
2012-04-12 23:10:49 +02:00 |
|
Georg Ehrke
|
0f16935763
|
fix bugs and optimize OC_Calendar_Object Class
|
2012-04-11 10:21:45 -04:00 |
|
Georg Ehrke
|
64d3301523
|
make shared events editable and add (empty) classes for alarm and attendees
|
2012-04-10 16:03:38 -04:00 |
|
Georg Ehrke
|
eaa649cfb2
|
fix bug in share lib of calendar
|
2012-04-10 11:18:02 -04:00 |
|
Georg Ehrke
|
9294a95438
|
fix view of single shared events
|
2012-04-07 22:54:38 -04:00 |
|
Georg Ehrke
|
960553f9c4
|
fix path and class name
|
2012-04-07 22:45:44 -04:00 |
|
Georg Ehrke
|
5a4237a31d
|
make dropdown menu work with single event sharing
|
2012-04-07 22:41:24 -04:00 |
|
Georg Ehrke
|
97d216c94d
|
add dropdown to eventform
|
2012-04-07 22:40:20 -04:00 |
|
Georg Ehrke
|
4d884c3849
|
clean up events.php of calendar
|
2012-04-07 22:39:37 -04:00 |
|
Georg Ehrke
|
e940152bce
|
fix bugs in share lib of calendar
|
2012-04-07 22:39:02 -04:00 |
|
Georg Ehrke
|
eef9a1e7ed
|
add access check to ajax files
|
2012-04-07 22:37:26 -04:00 |
|
Georg Ehrke
|
e18c0d54f6
|
add output functions and access function to app.php of calendar
|
2012-04-07 22:35:29 -04:00 |
|
Georg Ehrke
|
72a43b3929
|
revert 0fd8b1a044
|
2012-04-02 08:32:27 -04:00 |
Scott Shambarger
|
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 |
|
Georg Ehrke
|
0fd8b1a044
|
fix events.php for rewritten OC_Caledar_App class
|
2012-03-31 16:16:34 -04:00 |
|
Georg Ehrke
|
ca2c7001c4
|
remove unused code in OC_Calendar_App class
|
2012-03-31 16:15:04 -04:00 |
|
Georg Ehrke
|
70237f7ecc
|
rewrite OC_Calendar_APP class
|
2012-03-31 16:13:04 -04:00 |
|
Georg Ehrke
|
10fc51dc92
|
add public sharing fir calendars and events - add function in Share class
|
2012-03-31 16:12:27 -04:00 |
|
Georg Ehrke
|
cf26f8a6a7
|
add public sharing for calendars and events
|
2012-03-31 17:32:43 +01:00 |
|
Georg Ehrke
|
4b3f074309
|
add new parameters to export file
|
2012-03-31 17:27:30 +01:00 |
|
Georg Ehrke
|
1f8cf2d8f2
|
fix name of constants
|
2012-03-31 13:37:44 +02:00 |
|
Georg Ehrke
|
a88305b4cb
|
remove share tab from read only event dialog
|
2012-03-31 13:11:30 +02:00 |
|
Georg Ehrke
|
90286353e2
|
Merge branch 'master' into sabredav_1.6
|
2012-03-29 23:20:03 +02:00 |
|
Georg Ehrke
|
d15959d573
|
Merge branch 'master' into calendar_sharing
|
2012-03-29 23:19:31 +02:00 |
|
Georg Ehrke
|
08b4f996d3
|
add backslash r to the newline var
|
2012-03-28 17:06:16 +02:00 |
|
Georg Ehrke
|
c384e3ba4f
|
fix width of dropdown to select monthdays - bugfix oc-354
|
2012-03-27 09:24:55 +02:00 |
|
Georg Ehrke
|
f479105f5e
|
optimize choosecalendar dialog for shared calendars
|
2012-03-26 16:01:55 +02:00 |
|
Georg Ehrke
|
10ef01b04b
|
fix displayed username of person who shares
|
2012-03-26 15:44:24 +02:00 |
|
Georg Ehrke
|
8b9d439841
|
Calendar: fix address for import file
|
2012-03-26 15:37:47 +02:00 |
|
Georg Ehrke
|
179bf15daf
|
fix group sql generator in calendar's share lib
|
2012-03-26 15:30:04 +02:00 |
|
Georg Ehrke
|
71b32f7ad4
|
add read only 'form' for shared events
|
2012-03-26 15:24:43 +02:00 |
|
Georg Ehrke
|
b7a5ae38c5
|
fix sql command in calendar's share lib
|
2012-03-26 09:48:58 +02:00 |
|
Georg Ehrke
|
ac0c5ba6da
|
Merge branch 'master' into sabredav_1.6
|
2012-03-25 14:02:40 +02:00 |
|
Georg Ehrke
|
19c101a660
|
fix merge conflicts
|
2012-03-25 14:02:02 +02:00 |
|
Georg Ehrke
|
0e11cc9f6f
|
fix previous made bug and fix oc bug - oc-139
|
2012-03-23 17:27:52 +01:00 |
|
Georg Ehrke
|
ac8362e34a
|
check if the title of an event is null - bugfix for oc-139
|
2012-03-23 17:09:51 +01:00 |
|
Georg Ehrke
|
33b06c4484
|
Merge branch 'master' into sabredav_1.6
|
2012-03-19 08:33:36 +01:00 |
|
Georg Ehrke
|
eaa1074ccb
|
Merge branch 'master' into calendar_sharing
|
2012-03-17 13:59:00 +01:00 |
Tom Needham
|
122f7e4c2f
|
Dont truncate the time format
|
2012-03-17 12:41:16 +00:00 |
|
Georg Ehrke
|
27218f85cb
|
Merge branch 'master' into calendar_sharing
|
2012-03-16 12:17:58 +01:00 |
|
Bart Visscher
|
d8cfe77ba5
|
Contacts: small fixes and cleanups
|
2012-03-07 21:46:42 +01:00 |
|
Georg Ehrke
|
f2dcab50b5
|
fix merge conflicts
|
2012-03-03 15:06:51 +01:00 |
|
Georg Ehrke
|
4c45483ad3
|
make calendar compatible with php 5.2 - works for me with PHP 5.2.12
|
2012-03-03 14:30:52 +01:00 |
|
Jakob Sack
|
503e5cada3
|
Add /dav.php, a single location bundling all *DAV-operations.
|
2012-03-02 20:25:20 +01:00 |
|
Bart Visscher
|
d1dcd7893c
|
Search: Change provider registration to class name, for lazy loading of search providers
|
2012-03-01 22:59:35 +01:00 |
|
Bart Visscher
|
5dcd9e20d0
|
Small cleanups
|
2012-03-01 21:00:23 +01:00 |
|
Bart Visscher
|
ec2f49833d
|
Calendar: Don't request edit form for readonly events
|
2012-03-01 21:00:23 +01:00 |
|
Bart Visscher
|
f914cd0144
|
Implement showing Birthdays of contacts in the calendar
|
2012-03-01 21:00:22 +01:00 |
|
Bart Visscher
|
fe3bcb5fe2
|
Calendar: fix bug in creating DTEND from DTSTART
|
2012-03-01 21:00:22 +01:00 |
|
Georg Ehrke
|
089c24e650
|
fix baseUri of the Caldav server
|
2012-02-26 21:44:35 +01:00 |
|
Georg Ehrke
|
8c09330959
|
add missing parameter to addEventListener function - bugfix for oc-225
|
2012-02-26 21:29:52 +01:00 |
|
Georg Ehrke
|
04c9cc6034
|
give users the possibility to choose between monday and sunday as first day of the week
|
2012-02-26 21:23:20 +01:00 |
Frank Karlitschek
|
ab96fa67c8
|
first part of the abstraction work of the apps folder. more to come
|
2012-02-26 18:26:41 +01:00 |
|
Georg Ehrke
|
89865cb8a0
|
stop using 3rdparty services for timezone detection
|
2012-02-26 13:45:51 +01:00 |
|
Georg Ehrke
|
bfb67286c8
|
fix merge conflicts
|
2012-02-25 16:54:27 +01:00 |
|
Georg Ehrke
|
1d1dfcbc1a
|
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
|
2012-02-24 22:20:40 +01:00 |
Marvin Thomas Rabe
|
9df193f051
|
Calendar selection only available if there are more than one.
|
2012-02-23 22:28:14 +01:00 |
Georg Ehrke
|
b1fb325d48
|
rename updatecalendar to update
|
2012-02-23 22:07:31 +01:00 |
|
Georg Ehrke
|
f285790fa1
|
change links in the event form for the new ajax folders
|
2012-02-23 22:07:08 +01:00 |
|
Georg Ehrke
|
319e93f7fb
|
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
|
2012-02-23 22:06:43 +01:00 |
|
Georg Ehrke
|
cfa284bfa8
|
update js files for new ajax pathes
|
2012-02-23 22:06:16 +01:00 |
|
Georg Ehrke
|
8cd1027214
|
better var name in changeview.php
|
2012-02-23 22:00:46 +01:00 |
|
Georg Ehrke
|
b7de1850a0
|
add moved files to clean up ajax folder
|
2012-02-23 21:58:39 +01:00 |
|
Georg Ehrke
|
e188b96596
|
remove old ajax files
|
2012-02-23 21:58:01 +01:00 |