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 |
|
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 |
Georg Ehrke
|
d8734cee02
|
fix sql command
|
2012-02-18 11:21:07 +01:00 |
|
Georg Ehrke
|
011bc1e764
|
fix unsharing of groups
|
2012-02-17 21:19:04 +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 - & => &
|
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 |