Georg Ehrke
|
ad66bb9c84
|
Merge branch 'calendar_dropimport'
|
2012-05-19 18:58:24 +02:00 |
|
Georg Ehrke
|
07fa8da278
|
fix for calendar
|
2012-05-19 15:05:58 +02:00 |
Frank Karlitschek
|
9e73524168
|
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
|
2012-05-18 16:06:57 +02:00 |
|
Georg Ehrke
|
38b93653a1
|
Merge branch 'master' into calendar_dropimport
|
2012-05-17 22:17:06 +02:00 |
|
Georg Ehrke
|
6146b6a131
|
fix paths to images and set height for calendar management dialog
|
2012-05-17 21:51:38 +02:00 |
Robin Appelman
|
ac8bfc218e
|
update translations
|
2012-05-17 00:36:21 +02:00 |
|
Georg Ehrke
|
9e83c3f823
|
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
|
2012-05-16 21:05:15 +02:00 |
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Georg Ehrke
|
18c8896b3c
|
better user permission check for files in ajax/calendar/
|
2012-05-14 15:59:06 +02:00 |
|
Georg Ehrke
|
84827ff992
|
some fixes for calendar's export.php
|
2012-05-14 15:52:24 +02:00 |
|
Georg Ehrke
|
9c8eb104b6
|
check user permissions in calendar's changepermission.php
|
2012-05-14 15:42:16 +02:00 |
|
Georg Ehrke
|
55eb318265
|
check user permissions in calendar's unshare.php
|
2012-05-14 15:42:16 +02:00 |
|
Robin Appelman
|
e7c106d91e
|
selective app loading for remote/public
|
2012-05-14 00:28:28 +02:00 |
|
Georg Ehrke
|
ddf0903ace
|
add post user delete hook for calendar sharing
|
2012-05-13 20:03:52 +02:00 |
|
Robin Appelman
|
ee0294bbb1
|
update translations
|
2012-05-13 20:00:34 +02:00 |
|
Georg Ehrke
|
0892abd050
|
some little js fixes for drop import
|
2012-05-13 15:08:27 +02:00 |
|
Georg Ehrke
|
62a86748b5
|
Merge branch 'master' into calendar_dropimport
|
2012-05-13 15:06:02 +02:00 |
|
Georg Ehrke
|
63a1b066bc
|
add first version of drop import
|
2012-05-13 15:05:57 +02:00 |
|
Georg Ehrke
|
5ac10a9c0e
|
hide share tab for new events, because you can't share an event that haven't got an id yet
|
2012-05-13 12:28:28 +02:00 |
|
Georg Ehrke
|
f45411f79d
|
fix another php notice
|
2012-05-13 12:25:26 +02:00 |
|
Georg Ehrke
|
85cc34fd05
|
fix another php notice
|
2012-05-13 12:14:08 +02:00 |
|
Georg Ehrke
|
f6dc158d51
|
fix php notice and displaying of events
|
2012-05-13 12:02:36 +02:00 |
|
Robin Appelman
|
736739bbbd
|
load remote and public paths from info.xml during upgrade instead of setting them every time
|
2012-05-11 20:33:56 +02:00 |
Brice Maron
|
4094f6f8e0
|
Correct undef variable mistake from prev commit
|
2012-05-10 19:51:03 +00:00 |
|
Brice Maron
|
ffe5ef2268
|
Correct calendar loading when calendar are from hooks. fix oc-619
|
2012-05-10 19:36:30 +00:00 |
|
Georg Ehrke
|
a589a700e1
|
revert 000d7ba975
|
2012-05-09 18:34:44 +02:00 |
|
Georg Ehrke
|
99db3c01ee
|
fix bug in events.php
|
2012-05-09 17:36:48 +02:00 |
|
Robin Appelman
|
588b51d88a
|
update translations
|
2012-05-09 12:41:01 +02:00 |
|
Georg Ehrke
|
000d7ba975
|
fix bug in calendar
|
2012-05-09 11:53:16 +02:00 |
Bart Visscher
|
da1da8197e
|
Calendar: Resize content after creating calendar layout
The calendar can be higher than the window, this corrects for the scrollbar
|
2012-05-08 18:40:40 +02:00 |
|
Georg Ehrke
|
cdf5d4e231
|
fix for previous commit
|
2012-05-08 08:49:14 +02:00 |
|
Georg Ehrke
|
0ce1cbdd14
|
fix calendar vulnerability
|
2012-05-08 08:46:27 +02:00 |
|
Bart Visscher
|
4dbc2093c6
|
Create a function for linking to remote.php
|
2012-05-07 21:47:14 +02:00 |
|
Georg Ehrke
|
ef073a148f
|
make calendar compatible with public.php
|
2012-05-07 15:48:41 +02:00 |
|
Georg Ehrke
|
936c8ba1cc
|
improve remote.php and create public.php
|
2012-05-07 15:39:17 +02:00 |
|
Georg Ehrke
|
b125caaaf6
|
fix path of caldav in calendar management
|
2012-05-07 12:16:25 +02:00 |
|
Georg Ehrke
|
ef10603c26
|
fix pathes in calendar and contacts
|
2012-05-07 12:02:20 +02:00 |
|
Georg Ehrke
|
46fe2e3e2a
|
fix merge conflicts
|
2012-05-07 11:47:14 +02:00 |
|
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
Thomas Tanghus
|
2488cdb8a1
|
Calendar: Fixed image paths.
|
2012-05-06 19:19:16 +02:00 |
|
Brice Maron
|
9dbc6b5158
|
Correct wrong DB quotes for calendar share functions
|
2012-05-06 15:41:14 +00:00 |
|
Georg Ehrke
|
c996600786
|
push changes
|
2012-05-05 22:54:14 +02:00 |
|
Georg Ehrke
|
aa4f01fbcc
|
fix pathes for cal andcarddav
|
2012-05-05 18:58:58 +02:00 |
|
Georg Ehrke
|
4b4c3c3f3a
|
remove debug messages
|
2012-05-05 18:58:58 +02:00 |
|
Georg Ehrke
|
101406eba7
|
fix writing in remote folder
|
2012-05-05 18:29:26 +02:00 |
|
Bart Visscher
|
2facf509cc
|
Merge branch 'tasks' for Tasks app
|
2012-05-05 18:26:13 +02:00 |
|
Frank Karlitschek
|
9bcc5c11a8
|
porting the hooks and starting with the templates
|
2012-05-05 10:18:45 +02:00 |
|
Bart Visscher
|
1fef13b0c0
|
Calendar: Use array_merge to join event arrays
|
2012-05-04 17:34:13 +02:00 |
|
Bart Visscher
|
1e47156226
|
Merge branch 'master' into tasks
|
2012-05-04 17:04:11 +02:00 |
|
Thomas Tanghus
|
2296521a2e
|
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
|
2012-05-04 11:16:29 +02:00 |