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

529 commits

Author SHA1 Message Date
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
Frank Karlitschek
a62e109e8c make the location of the 3rdparty folder flexible. 
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
 2012-02-23 15:37:38 +01:00
Georg Ehrke
9460c9e907 remove old import.php 2012-02-22 11:53:28 +01:00
Georg Ehrke
cff0ac2bf9 better permission check in resize.php 2012-02-22 10:42:33 +01:00
Georg Ehrke
0ae088a50a add getowner function to OC_Calendar_Object 2012-02-22 10:42:01 +01:00
Georg Ehrke
48f42176cd add is_editing_allowed function to OC_Calendar_Share 2012-02-22 10:41:16 +01:00
Georg Ehrke
d20b8399c3 clean up sql commands in OC_Calendar_Share 2012-02-22 10:20:58 +01:00
Georg Ehrke
3d8d6d718b add 'permissions' as a sql condition in allSharedwithuser 2012-02-21 20:10:52 +01:00
Bart Visscher
86d2927c02 Calendar: Correct calendarcolor format for ical color property 2012-02-21 20:10:40 +01:00
Georg Ehrke
236d2aa5b8 rename updatecalendar to update 2012-02-21 19:42:48 +01:00
Georg Ehrke
e227a65f66 Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing 2012-02-21 19:36:42 +01:00
Georg Ehrke
70a369e16d change links in the event form for the new ajax folders 2012-02-21 19:16:14 +01:00
Georg Ehrke
0ae2e250f5 change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax 2012-02-20 11:52:19 +01:00
Georg Ehrke
a069d83f44 fix unexspected T-String in calendars index.php 2012-02-20 11:46:10 +01:00
Georg Ehrke
ec7ed3c882 add rw and r to events.php 2012-02-20 11:35:19 +01:00
Georg Ehrke
619c62e681 change parameter names for shared calendars 2012-02-20 11:31:41 +01:00
Georg Ehrke
548a2e6263 add readonly calendar to the eventsources 2012-02-20 11:28:20 +01:00
Georg Ehrke
3efa69bc84 update js files for new ajax pathes 2012-02-20 11:27:25 +01:00
Georg Ehrke
1cf7fc261f better var name in changeview.php 2012-02-20 11:26:43 +01:00
Georg Ehrke
8dff0fb58d add moved files to clean up ajax folder 2012-02-20 11:26:22 +01:00
Georg Ehrke
ceb0016bdc remove old ajax files 2012-02-20 11:25:42 +01:00
Florian Pritz
9d2379742b apps/calendar: update ctag after deleteFromDAVData 
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2012-02-19 21:42:47 +01:00
Georg Ehrke
d8734cee02 fix sql command 2012-02-18 11:21:07 +01:00
Bart Visscher
6bbd67c3c6 Calendar: only update default view when it really changed 2012-02-17 22:10:02 +01:00
Bart Visscher
539fd7240c Calendar: optimize sending calendar events, also enabled caching of result 2012-02-17 22:09:31 +01:00
Bart Visscher
a33b757b19 Calendar: Add default repeat values when editing a non-repeating event 2012-02-17 22:09:22 +01:00
Bart Visscher
e8b69d45a3 Fixup use of OC_Helper::linkTo function 2012-02-17 22:07:14 +01:00
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Georg Ehrke
011bc1e764 fix unsharing of groups 2012-02-17 21:19:04 +01:00
Henning Becker
62da0bae43 Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore. 2012-02-17 14:32:02 +01:00
Georg Ehrke
01827e9340 Merge branch 'master' into calendar_sharing 2012-02-13 17:08:52 +01:00
Georg Ehrke
40d343e2af fix oc-bug 239 - & => &amp; 2012-02-12 22:34:10 +01:00
Georg Ehrke
c9db88aa3b Merge branch 'master' into calendar_sharing 2012-02-12 10:46:34 +01:00
Georg Ehrke
73038156cc check userrights in events.php 2012-02-12 10:40:57 +01:00
Bart Visscher
b5418173e5 Derive the user principles from the owncloud users 
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
 2012-02-11 21:09:51 +01:00
Georg Ehrke
db23ec5c1c show shared calendars 2012-02-11 14:02:51 +01:00
Georg Ehrke
66ac6c232c fix sharing calendar manager 2012-02-11 13:30:15 +01:00
Georg Ehrke
a8b7ae515c Merge branch 'master' into calendar_sharing 2012-02-10 19:36:00 +01:00
Bart Visscher
7c03b612d2 OC-41: [Calendar] Date format not translatable 2012-02-08 21:12:30 +01:00
Georg Ehrke
9fd07ee10d Merge branch 'master' into calendar 2012-02-08 17:13:50 +01:00
Georg Ehrke
cdf1cf82ba merge 64a617b2a1 into master 2012-02-07 22:49:23 +01:00
Georg Ehrke
55be59e738 Merge branch 'master' into calendar 2012-02-04 21:34:38 +01:00
Georg Ehrke
5e08d1bb40 Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar 2012-02-04 21:27:18 +01:00
Georg Ehrke
b810380d56 add sharing management for calendars 2012-02-04 21:23:31 +01:00
Georg Ehrke
ab31a890b6 use strip_tags for calendar names 2012-02-02 21:23:41 +01:00
Georg Ehrke
bfa69c3e59 add a label calendar to the settings page - bugfix for oc-157 2012-02-02 18:37:06 +01:00
Georg Ehrke
f81ac81550 fix merge conflicts 2012-02-02 17:48:29 +01:00
Georg Ehrke
92b8f32386 Calendar: Bugfix: better input validation 2012-02-02 15:01:05 +01:00
Georg Ehrke
91b705cc4f remove debug file 2012-02-02 12:37:58 +01:00
Georg Ehrke
f870f9efcf validate parameters in changeview.php 2012-02-02 12:18:29 +01:00
Georg Ehrke
39d312861a add active to the db structure of shared calendars 2012-01-31 22:33:39 +01:00
Georg Ehrke
2b8ec1cad0 Calendar: fix html of import dialog 2012-01-31 22:03:08 +01:00
Georg Ehrke
153467dbe0 add share as a tab 2012-01-31 21:39:40 +01:00
Georg Ehrke
3a5d3dfd97 increase version number to force db upgrade 2012-01-31 21:33:50 +01:00
Georg Ehrke
32bff22dc7 change db structure of calendar for sharing calendars 2012-01-31 21:26:09 +01:00
Georg Ehrke
64a617b2a1 fix all day with one day to much - bugfix for oc-126 2012-01-31 20:46:27 +01:00
Georg Ehrke
149bbeb260 make tab names translatable 2012-01-31 17:15:25 +01:00
Georg Ehrke
c72c4dd412 add alarm as a tab 2012-01-31 16:59:34 +01:00
Georg Ehrke
4c1fb4c282 fix style of the tabs 2012-01-31 16:49:21 +01:00
Georg Ehrke
fc70c7094a add tabs for repeating and attendees in the event form 2012-01-31 11:57:09 +01:00
Georg Ehrke
30f1de71a6 remove debug file 2012-01-29 16:08:09 +01:00
Georg Ehrke
928e9b121b fix version-compare in calendars app.php 2012-01-29 10:59:15 +01:00
Robin Appelman
ad4e305c96 update translations 2012-01-27 00:59:24 +01:00
Robin Appelman
830cf87697 use the correct hooks to remove contact/calendars of remvoed users 2012-01-26 19:05:46 +01:00
Robin Appelman
6fccf12299 update translations 2012-01-24 00:42:08 +01:00
Robin Appelman
cdfb252ced Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-01-24 00:24:09 +01:00
Georg Ehrke
b8e01939e9 fix undefined indices - bugfix for oc-99 2012-01-23 15:05:53 +01:00
Georg Ehrke
66f8a0e1a3 validate the calendar name 2012-01-21 17:42:52 +01:00
Georg Ehrke
78c5c2e7d5 fix Undefined variable - bugfix for oc-69 2012-01-21 17:42:52 +01:00
Robin Appelman
7ea2923fa8 translation updates 2012-01-20 18:53:45 +01:00
Bart Visscher
ccad24a925 [Calendar] Use class for active view button 2012-01-19 21:00:19 +01:00
Bart Visscher
838766add0 OC-23: [Calendar] Double vertical scrollbar in week view 2012-01-19 20:50:22 +01:00
Georg Ehrke
ce13b3b7cd fix double new calendar button - bugfix for oc 59 2012-01-19 12:27:16 +01:00
Georg Ehrke
69ca0ae177 move loading icon to the top bar 2012-01-17 19:48:29 +01:00
Georg Ehrke
1f95231801 use button for new calendar 2012-01-17 19:09:11 +01:00
Georg Ehrke
6e86b34586 Merge branch 'master' into calendar 2012-01-17 15:57:29 +01:00
Georg Ehrke
91016e37d4 fix ocbug 34 2012-01-17 15:38:32 +01:00
Georg Ehrke
42b1c75a66 fix ocbug 24 2012-01-17 15:18:01 +01:00
Georg Ehrke
2179437726 use timepicker to force users to use HH:MM 2012-01-16 20:22:54 +01:00
Robin Appelman
965ea96439 update translations 2012-01-16 17:34:53 +01:00
Georg Ehrke
c81beab96d Merge branch 'master' into calendar 2012-01-15 18:33:46 +01:00
Georg Ehrke
3364502f00 use svg icon for calendar 2012-01-15 18:29:44 +01:00
Robin Appelman
7cd809b286 update translations 2012-01-15 15:12:58 +01:00
Georg Ehrke
ec3955b158 change description of the changed colors (calendar) 2012-01-15 10:58:39 +01:00
Georg Ehrke
cf1023567b change calendar colors 2012-01-15 10:52:07 +01:00
Georg Ehrke
360778e520 use backslash n instead of a real new line 2012-01-15 00:56:11 +01:00
Georg Ehrke
43f7b2fd2d fix newline problem in calendar 2012-01-15 00:45:27 +01:00
Georg Ehrke
87b46decfa added bart to the authors in info.xml 2012-01-15 00:30:04 +01:00
Georg Ehrke
b1433119cc highlight the current view 2012-01-15 00:06:26 +01:00
Georg Ehrke
868cf46290 improve import function 2012-01-14 14:22:30 +01:00
Georg Ehrke
f9c4975a45 improve import form for calendar 2012-01-13 13:57:46 +01:00
Georg Ehrke
28e15fd487 Merge branch 'calendar' 2012-01-12 22:07:23 +01:00
Georg Ehrke
cd8f54ade2 update js of calendar import 2012-01-12 22:06:53 +01:00
Georg Ehrke
9bcd367873 Merge branch 'master' into calendar 2012-01-12 21:44:56 +01:00
Georg Ehrke
0b45d19ea0 change app icon 2012-01-12 16:50:49 +01:00
Robin Appelman
d92b083c1d fix old calendar name and color not being preserved when editing a calendar 2012-01-11 01:53:25 +01:00
Robin Appelman
f67e5d18e7 update translations 2012-01-11 01:06:59 +01:00
Georg Ehrke
c3cda81577 update calendar pot file 2012-01-07 18:30:32 +01:00
Georg Ehrke
67a8ae084a fix search function 2012-01-07 14:31:47 +01:00
Georg Ehrke
f18e866a1e improve search function 2012-01-06 14:36:24 +01:00
Georg Ehrke
cb445deb5f fix login check in ajax files 2012-01-05 21:02:11 +01:00
Georg Ehrke
486694c2ec fix js for repeating events 2012-01-05 20:54:44 +01:00
Georg Ehrke
a01a3d412c fix autodetection for the week of the month 2012-01-05 17:53:13 +01:00
Georg Ehrke
edc9a150aa fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination 2012-01-05 17:49:09 +01:00
Georg Ehrke
d3a0c7354c fix repeat rule for every weekday 2012-01-05 17:09:01 +01:00
Georg Ehrke
a88cc91ad9 fix end for repeating events 2012-01-05 17:05:30 +01:00
Georg Ehrke
5ccd26959f remove unused js 2012-01-02 11:39:23 +01:00
Georg Ehrke
e6739d230e add function to detect always the timezone 2012-01-02 11:35:50 +01:00
Georg Ehrke
3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +01:00
Bart Visscher
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
Bart Visscher
5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Georg Ehrke
ffa835c56f fix the default setting for yearly repeating events 2011-12-26 19:59:15 +01:00
Georg Ehrke
9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Georg Ehrke
8ee53708ae use pre-decrement instead of post-decrement 2011-12-25 15:07:53 +01:00
Georg Ehrke
5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke
469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bart Visscher
ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher
4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Thomas Tanghus
39430c837f Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-11 16:29:53 +01:00
Georg Ehrke
56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke
33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke
b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher
1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher
a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Thomas Tanghus
7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 
Conflicts:
	apps/contacts/ajax/deletebook.php
	apps/contacts/index.php
 2011-12-09 15:25:26 +01:00
Georg Ehrke
bd68cee8cf add resettimezone file for testing timezone detection 2011-12-09 14:36:43 +01:00
Georg Ehrke
add48b2657 optimize timezone detection 2011-12-09 14:35:59 +01:00
Georg Ehrke
2103c331a0 Merge branch 'master' into calendar 2011-12-08 14:03:14 +01:00
Bart Visscher
c67ac46b6c Use a proxy class to interface with Sabre_VObject classes 2011-12-07 20:40:58 +01:00
Thomas Tanghus
2b48b733a3 Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup 2011-12-04 20:42:30 +01:00
Georg Ehrke
361d4ac13b fix merge conflicts 2011-12-03 17:25:17 +01:00
Thomas Tanghus
58d1a3516a Removed some debug statements. 
Changed double quotes to single quotes.
 2011-12-01 16:06:27 +01:00
Bart Visscher
0bbeb13e26 Calendar: Also check if the enddate is in the requested range for events 2011-11-30 21:13:26 +01:00
Bart Visscher
e5fdc6013a Calendar: Use the default timezone that is set in lib/base.php 2011-11-30 21:13:04 +01:00
Bart Visscher
ee549dfb38 Fix scrolling through months 2011-11-23 21:07:49 +01:00
Georg Ehrke
a38778f911 fix timeformat setting for fullcalendar 2011-11-20 14:23:26 +01:00
Georg Ehrke
3d498002d0 first implementation of the search function 2011-11-14 22:52:34 +01:00
Georg Ehrke
89b3a395df fix timezone for repeating events 2011-11-12 22:30:09 +01:00
Georg Ehrke
a303992d78 support for repeating events 2011-11-12 22:02:04 +01:00
Georg Ehrke
eea20e51d8 another fix of caldav url 2011-11-12 16:13:27 +01:00
Georg Ehrke
7fd52de2d3 fix merge conflicts 2011-11-12 15:13:44 +01:00
Georg Ehrke
e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Georg Ehrke
03d9fab3c0 fix caldav url 2011-11-12 14:06:14 +01:00
Georg Ehrke
26272c4252 automatic timezone detection 2011-11-11 15:51:44 +01:00
Bart Visscher
ef124c3e21 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Bart Visscher
b095859a92 Use Last-Modified property to check for changed events 2011-11-09 22:17:09 +01:00
Bart Visscher
c65e417666 Use parse function in Calendar_Object 2011-11-09 22:16:24 +01:00
Brice Maron
e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Bart Visscher
8dd2f463f8 Cleanup tipsy popups on more actions 2011-10-27 22:56:22 +02:00
Bart Visscher
1e8e2ae353 Move unselect call to after the dialog starts 2011-10-27 22:54:39 +02:00
Bart Visscher
d0e9c81399 Quickfix hanging tipsy popups 2011-10-25 20:01:04 +02:00
Bart Visscher
55d957489d Fix fromtime/totime warnings 2011-10-25 19:59:23 +02:00
Bart Visscher
50649ad0d1 Implement select event creation 2011-10-25 19:57:20 +02:00
Bart Visscher
950018b5c3 Fix scrolling calendar 2011-10-25 19:56:57 +02:00