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
|
99db3c01ee
|
fix bug in events.php
|
2012-05-09 17:36:48 +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 |
Frank Karlitschek
|
1945cd6946
|
ported the oc_template class
|
2012-05-06 23:00:36 +02:00 |
Bart Visscher
|
1fef13b0c0
|
Calendar: Use array_merge to join event arrays
|
2012-05-04 17:34:13 +02:00 |
|
Bart Visscher
|
07ff1e723a
|
Calendar: Fix repeating events
|
2012-05-03 23:33:44 +02:00 |
|
Bart Visscher
|
077ea94f71
|
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
apps/calendar/ajax/events.php
|
2012-05-03 23:18:43 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Frank Karlitschek
|
4fe90f62f4
|
port checkAppEnabled
|
2012-05-02 19:08:37 +02:00 |
|
Frank Karlitschek
|
82a61e2e1a
|
port oc_preferences
|
2012-05-02 15:54:34 +02:00 |
|
Frank Karlitschek
|
254b8b9506
|
porting of OC_User to public API complete.
What better thing to do during a long train ride than refactoring ;-)
|
2012-05-01 19:04:20 +02:00 |
|
Frank Karlitschek
|
70cea18cce
|
ported getUser
|
2012-05-01 18:50:31 +02:00 |
|
Frank Karlitschek
|
5bf69237b2
|
ported isLoggedIn
|
2012-05-01 18:46:15 +02:00 |
|
Frank Karlitschek
|
d0554bef06
|
finish porting of the LOG calls or the apps to the public api
|
2012-05-01 17:38:27 +02:00 |
|
Georg Ehrke
|
8a3d41c043
|
fix a PHP Notice
|
2012-04-30 21:46:33 +02:00 |
Thomas Mueller
|
07f2e316e4
|
removing executable bit from various files
|
2012-04-30 12:05:57 +02:00 |
|
Georg Ehrke
|
2b10371bde
|
fix merge conflicts
|
2012-04-26 18:08:49 +02:00 |
|
Georg Ehrke
|
4c2cf35050
|
fix merge conflicts
|
2012-04-22 13:19:12 +02:00 |
|
Georg Ehrke
|
0918fc7d91
|
fix merge conflicts
|
2012-04-21 23:21:50 +02:00 |
|
Georg Ehrke
|
e29ae46609
|
fix merge conflicts
|
2012-04-21 22:12:31 +02:00 |
|
Georg Ehrke
|
de71842888
|
implement shared calendar activation on server side
|
2012-04-18 11:50:12 +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
|
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 |
|
Georg Ehrke
|
e256ac8791
|
fix unsharing of events
|
2012-04-13 21:49:24 -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
|
854eaff34f
|
hide share tab in shared events
|
2012-04-13 16:20:19 -04: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 |
|
Georg Ehrke
|
df2e788a1c
|
fix calendarid in eventform and validation of calendarid
|
2012-04-12 23:15:19 -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
|
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
|
4d884c3849
|
clean up events.php of calendar
|
2012-04-07 22:39:37 -04:00 |
|
Georg Ehrke
|
eef9a1e7ed
|
add access check to ajax files
|
2012-04-07 22:37:26 -04:00 |
|
Georg Ehrke
|
72a43b3929
|
revert 0fd8b1a044
|
2012-04-02 08:32:27 -04:00 |
|
Georg Ehrke
|
0fd8b1a044
|
fix events.php for rewritten OC_Caledar_App class
|
2012-03-31 16:16:34 -04:00 |
|
Georg Ehrke
|
1f8cf2d8f2
|
fix name of constants
|
2012-03-31 13:37:44 +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
|
71b32f7ad4
|
add read only 'form' for shared events
|
2012-03-26 15:24:43 +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 |