c419c8bce1
Merge branch 'master' into calendar_repeat
2012-06-16 09:35:53 +02:00
54f263b258
Calendar: Write-close session to enable parallel events.php requests
2012-06-16 00:44:23 +02:00
0afd453b06
fix merge conflicts
2012-06-15 11:48:26 +02:00
47f93f22f8
Agree on argument type (cleaned this time).
2012-06-15 01:51:26 +02:00
a17ce992bf
Revert "Agree on argument type."
...
This reverts commit 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294.
2012-06-15 00:53:13 +02:00
3e194fbf9a
Agree on argument type.
2012-06-15 00:50:42 +02:00
382d357ecc
Make events show again.
2012-06-15 00:26:34 +02:00
0a86d75d5f
show username of the body who shares in the summary
2012-06-13 22:07:30 +02:00
0f2e7f9192
show username of the body who shares in the summary
2012-06-13 22:07:23 +02:00
cbdd8f023d
add some information about repeating events caching on personal settings page
2012-06-11 22:16:26 +02:00
fc828e6630
remove include command for when
2012-06-10 18:41:17 +02:00
775f8c9e2e
fix merge conflicts
2012-06-10 18:38:01 +02:00
874b42edf8
make use of post instead of get
2012-06-09 14:41:26 +02:00
4b0f8a544e
fix merge conflicts
2012-06-08 11:21:55 +02:00
266116ecd8
Corrected typos.
2012-06-06 11:50:49 +02:00
273c2097fd
Corrected typos.
2012-06-06 11:49:45 +02:00
eb0e970e53
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
e2dcd55ac1
Calendar & Contacts: Store import progress in OC_Cache
...
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
48527b5e5f
add status
...
file for repeating events caching
2012-06-01 13:47:48 +02:00
8f4c7b48f7
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
422ade2b83
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
281933f8fa
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
b82ca5fcf0
fix status
...
of timezone detection
2012-05-29 13:14:36 +02:00
641dc8d12f
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
1734bfec25
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
548122e170
fix for calendar
2012-05-19 15:05:58 +02:00
32908a261b
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
4af9ab5d8d
removing executable bit - again
2012-05-15 00:52:00 +02:00
1495f68169
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
b40ea97e0b
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
429a65511b
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00
64a3459350
Merge branch 'master' into calendar_dropimport
2012-05-13 15:06:02 +02:00
1f262fc564
add first version of drop import
2012-05-13 15:05:57 +02:00
c187a9245b
fix another php notice
2012-05-13 12:25:26 +02:00
19f0d080db
fix php notice and displaying of events
2012-05-13 12:02:36 +02:00
a7fe85c6fb
Correct undef variable mistake from prev commit
2012-05-10 19:51:03 +00:00
7a19e3583e
Correct calendar loading when calendar are from hooks. fix oc-619
2012-05-10 19:36:30 +00:00
842b077888
fix bug in events.php
2012-05-09 17:36:48 +02:00
e94373322f
fix for previous commit
2012-05-08 08:49:14 +02:00
ac964334db
fix calendar vulnerability
2012-05-08 08:46:27 +02:00
18df979721
ported the oc_template class
2012-05-06 23:00:36 +02:00
1c1475ec4f
Calendar: Use array_merge to join event arrays
2012-05-04 17:34:13 +02:00
8b7dec4031
Calendar: Fix repeating events
2012-05-03 23:33:44 +02:00
e939d31720
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
c7b935ada8
ported oc_json
2012-05-03 12:23:29 +02:00
ca34a9842c
port checkAppEnabled
2012-05-02 19:08:37 +02:00
7ff262880f
port oc_preferences
2012-05-02 15:54:34 +02:00
df3bea0e2e
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
178e107740
ported getUser
2012-05-01 18:50:31 +02:00
9e1227470e
ported isLoggedIn
2012-05-01 18:46:15 +02:00
1e8751f5c6
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
902a3ffd13
fix a PHP Notice
2012-04-30 21:46:33 +02:00
3f052f6d20
removing executable bit from various files
2012-04-30 12:05:57 +02:00
490794bd0f
fix merge conflicts
2012-04-26 18:08:49 +02:00
3a8d8ca727
fix merge conflicts
2012-04-22 13:19:12 +02:00
58102e4f8b
fix merge conflicts
2012-04-21 23:21:50 +02:00
c7fc5c7216
fix merge conflicts
2012-04-21 22:12:31 +02:00
a42f4aadeb
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
3822b9d130
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
58e3d3d308
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
e2cc51f1b2
fix merge conflicts
2012-04-15 12:43:07 +02:00
8259890cb5
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
4572b2dd40
fix unsharing of events
2012-04-13 21:49:24 -04:00
fe4eea4c81
check permission check in share function
2012-04-13 17:16:28 -04:00
305727e624
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
9b737c25bc
fix merge conflicts
2012-04-13 16:40:10 -04:00
262f0509b0
hide share tab in shared events
2012-04-13 16:20:19 -04:00
9658d2969d
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
bbc6be3863
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
d58207c3da
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
e46aa1adb2
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
6c86bf89fc
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
bb8b0c6674
fix view of single shared events
2012-04-07 22:54:38 -04:00
0b051e9c36
fix path and class name
2012-04-07 22:45:44 -04:00
3c182d384f
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
49a9516215
add access check to ajax files
2012-04-07 22:37:26 -04:00
1f6c6d70be
revert 0fd8b1a04430fc36bd62a0828530dc2bc3910e81
2012-04-02 08:32:27 -04:00
0c0de05363
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
29b5a2cb2e
fix name of constants
2012-03-31 13:37:44 +02:00
ee9b3efce3
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
cbea3e072c
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
d75447f6fb
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
b0b82c8fae
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
124da7a8d3
Merge branch 'master' into sabredav_1.6
2012-03-25 14:02:40 +02:00
ee6da78c15
fix merge conflicts
2012-03-25 14:02:02 +02:00
f3555063fe
fix previous made bug and fix oc bug - oc-139
2012-03-23 17:27:52 +01:00
8dd2f1b945
check if the title of an event is null - bugfix for oc-139
2012-03-23 17:09:51 +01:00
6db7b4c5fb
Merge branch 'master' into sabredav_1.6
2012-03-19 08:33:36 +01:00
b51c938c08
fix merge conflicts
2012-03-03 15:06:51 +01:00
9ccfafd787
make calendar compatible with php 5.2 - works for me with PHP 5.2.12
2012-03-03 14:30:52 +01:00
15e7cf829c
Implement showing Birthdays of contacts in the calendar
2012-03-01 21:00:22 +01:00
23f7b05f93
Calendar: fix bug in creating DTEND from DTSTART
2012-03-01 21:00:22 +01:00
92501d837b
give users the possibility to choose between monday and sunday as first day of the week
2012-02-26 21:23:20 +01:00
ee3dc62b4e
first part of the abstraction work of the apps folder. more to come
2012-02-26 18:26:41 +01:00
1769d4815e
stop using 3rdparty services for timezone detection
2012-02-26 13:45:51 +01:00
11505801a9
fix merge conflicts
2012-02-25 16:54:27 +01:00
37c0f664b8
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
4e9f44b239
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
ec5038cbe4
better var name in changeview.php
2012-02-23 22:00:46 +01:00
93c4d68d3e
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
4fffa203d2
remove old ajax files
2012-02-23 21:58:01 +01:00
90ed5ac5e7
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
f98fff3b98
better permission check in resize.php
2012-02-22 10:42:33 +01:00
362440f402
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
f65ca64b67
rename updatecalendar to update
2012-02-21 19:42:48 +01:00
5794699a9f
Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing
2012-02-21 19:36:42 +01:00
45ca11be4c
add rw and r to events.php
2012-02-20 11:35:19 +01:00
596deaad9d
better var name in changeview.php
2012-02-20 11:26:43 +01:00
5c17ad73df
add moved files to clean up ajax folder
2012-02-20 11:26:22 +01:00
f345a58300
remove old ajax files
2012-02-20 11:25:42 +01:00
9ee9a846f6
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
1fd0c0453c
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
979d2c086a
fix unsharing of groups
2012-02-17 21:19:04 +01:00
1ca92cd700
Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore.
2012-02-17 14:32:02 +01:00
df36d8f08e
check userrights in events.php
2012-02-12 10:40:57 +01:00
d079eae7c1
show shared calendars
2012-02-11 14:02:51 +01:00
ef9e51760c
Merge branch 'master' into calendar
2012-02-08 17:13:50 +01:00
c377d303cd
merge 64a617b2a1016108c946cc533875a40030bbd317 into master
2012-02-07 22:49:23 +01:00
c87dc297f2
Merge branch 'master' into calendar
2012-02-04 21:34:38 +01:00
2a71a8de29
Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar
2012-02-04 21:27:18 +01:00
733e4e3e82
add sharing management for calendars
2012-02-04 21:23:31 +01:00
84cf174424
use strip_tags for calendar names
2012-02-02 21:23:41 +01:00
26027dde91
fix merge conflicts
2012-02-02 17:48:29 +01:00
182f022e0b
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
09e70df51e
validate parameters in changeview.php
2012-02-02 12:18:29 +01:00
b03fe1a5df
fix all day with one day to much - bugfix for oc-126
2012-01-31 20:46:27 +01:00
0e3e46359f
fix undefined indices - bugfix for oc-99
2012-01-23 15:05:53 +01:00
7510ce1f50
validate the calendar name
2012-01-21 17:42:52 +01:00
dbf461dc99
fix Undefined variable - bugfix for oc-69
2012-01-21 17:42:52 +01:00
612c48d90c
improve import function
2012-01-14 14:22:30 +01:00
d2722cdff9
fix login check in ajax files
2012-01-05 21:02:11 +01:00
b8876e14ec
fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination
2012-01-05 17:49:09 +01:00
bf888c7801
fix end for repeating events
2012-01-05 17:05:30 +01:00
2a57536e20
add function to detect always the timezone
2012-01-02 11:35:50 +01:00
f3a79efb79
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +01:00
aa7187c6c7
make repeating events editable
2011-12-25 23:19:49 +01:00
fd0bb944bc
use pre-decrement instead of post-decrement
2011-12-25 15:07:53 +01:00
d578ac04f6
use OC_JSON::checkLoggedIn() in all ajax files
2011-12-22 16:31:01 +01:00
3d1370f549
fix merge conflicts
2011-12-21 22:16:46 +01:00
1d566db7e0
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
63486ee4d6
delete unused files
2011-12-10 17:54:42 +01:00
7ae9c7cd49
optimize timezone detection
2011-12-09 14:35:59 +01:00
def64dcf33
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
10297ad418
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
b3511acfa3
fix timezone for repeating events
2011-11-12 22:30:09 +01:00
5e7712faf3
support for repeating events
2011-11-12 22:02:04 +01:00
aa7cedd6c6
automatic timezone detection
2011-11-11 15:51:44 +01:00
323008792a
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
6cc83e3f05
Use parse function in Calendar_Object
2011-11-09 22:16:24 +01:00
230a7e8092
Implement select event creation
2011-10-25 19:57:20 +02:00
Georg Ehrke