ece1162949
use native sabredav functions to generate repeating events
2012-06-11 10:55:26 +02:00
c6a03ec6d8
remove include command for when
2012-06-10 18:41:17 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
bdb76d4873
Merge branch 'master' into calendar_export
2012-06-10 18:37:16 +02:00
e7f6f7e452
fix another XSS
2012-06-09 16:45:37 +02:00
c9214afff8
fix XSS in Calendar
2012-06-09 16:35:35 +02:00
2862740674
increase height of event dialog
2012-06-09 15:38:03 +02:00
cfb9c764ca
fix creation of monthly repeated events
2012-06-09 15:15:00 +02:00
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
a9b561430a
add hooks for events
2012-06-09 12:30:09 +02:00
7ed30649bb
add hooks for calendars
2012-06-09 12:18:25 +02:00
cac995ee9f
some more work on repeating events caching
2012-06-09 11:49:25 +02:00
ac74d87e3e
some work on repeating events caching
2012-06-08 22:22:16 +02:00
65cd15ca15
fix merge conflicts
2012-06-08 11:21:55 +02:00
1d93a8fcfe
Merge branch 'master' into calendar_export
2012-06-08 11:20:17 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
e1f4978150
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
6a812644e4
Correct remote and public, and last occurence of OC::
2012-06-06 20:24:15 +00:00
ca0108aabf
Corrected typos.
2012-06-06 11:50:49 +02:00
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
d8d558377c
Merge branch 'master' into calendar_export
2012-06-06 10:11:34 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
564b0358f9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 10:38:42 +02:00
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
091b343d5c
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
6560f1d894
don't change events timezone and remove the DTSTART value tag
2012-06-04 12:28:05 +02:00
c2a51d1f48
proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid
2012-06-03 14:54:53 +02:00
46b3b30d46
add status
...
file for repeating events caching
2012-06-01 13:47:48 +02:00
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
7a8e322679
some work for repeating events caching
2012-06-01 11:30:54 +02:00
f0bd571866
fix potential XSS
2012-05-31 20:01:12 +02:00
a33f580db1
Remove OC_App::register function
...
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
29b17672b4
a bit of work for repeating events caching
2012-05-29 19:46:17 +02:00
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
a56f2dbce7
Merge branch 'master' into calendar_repeat
2012-05-29 13:16:08 +02:00
75afc09b9d
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
22cd0f1cda
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:41:39 +00:00
5e7b318e42
add urlencode for caldav link
2012-05-28 10:49:27 +02:00
459114b994
Merge branch 'master' into calendar_repeat
2012-05-26 22:54:24 +02:00
a1c9191006
fix share for users with a point within their name
2012-05-26 15:23:46 +02:00
bc9accd26e
Merge branch 'master' into calendar_repeat
2012-05-25 10:30:00 +02:00
ad66bb9c84
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
07fa8da278
fix for calendar
2012-05-19 15:05:58 +02:00
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
7d49bf7f6e
some changes in calendar repeat class
2012-05-18 11:48:18 +02:00
f7366de673
Merge branch 'master' into calendar_repeat
2012-05-17 22:17:23 +02:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
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
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
18c8896b3c
better user permission check for files in ajax/calendar/
2012-05-14 15:59:06 +02:00
84827ff992
some fixes for calendar's export.php
2012-05-14 15:52:24 +02:00
9c8eb104b6
check user permissions in calendar's changepermission.php
2012-05-14 15:42:16 +02:00
55eb318265
check user permissions in calendar's unshare.php
2012-05-14 15:42:16 +02:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
ddf0903ace
add post user delete hook for calendar sharing
2012-05-13 20:03:52 +02:00
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
da9486157d
Merge branch 'master' into calendar_repeat
2012-05-13 19:10:49 +02:00
0892abd050
some little js fixes for drop import
2012-05-13 15:08:27 +02:00
62a86748b5
Merge branch 'master' into calendar_dropimport
2012-05-13 15:06:02 +02:00
63a1b066bc
add first version of drop import
2012-05-13 15:05:57 +02:00
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
f45411f79d
fix another php notice
2012-05-13 12:25:26 +02:00
85cc34fd05
fix another php notice
2012-05-13 12:14:08 +02:00
f6dc158d51
fix php notice and displaying of events
2012-05-13 12:02:36 +02:00
dfef36ba2f
some changes for calendar repeat class
2012-05-12 23:16:11 +02:00
b1cae9651e
add functions get cached events in a specific time period
2012-05-12 23:00:21 +02:00
dc34ed5a12
Merge branch 'master' into calendar_repeat
2012-05-12 22:55:35 +02:00
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
4094f6f8e0
Correct undef variable mistake from prev commit
2012-05-10 19:51:03 +00:00
ffe5ef2268
Correct calendar loading when calendar are from hooks. fix oc-619
2012-05-10 19:36:30 +00:00
a589a700e1
revert 000d7ba975
2012-05-09 18:34:44 +02:00
99db3c01ee
fix bug in events.php
2012-05-09 17:36:48 +02:00
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
000d7ba975
fix bug in calendar
2012-05-09 11:53:16 +02:00
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
cdf5d4e231
fix for previous commit
2012-05-08 08:49:14 +02:00
0ce1cbdd14
fix calendar vulnerability
2012-05-08 08:46:27 +02:00
4dbc2093c6
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
ef073a148f
make calendar compatible with public.php
2012-05-07 15:48:41 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
b125caaaf6
fix path of caldav in calendar management
2012-05-07 12:16:25 +02:00
ef10603c26
fix pathes in calendar and contacts
2012-05-07 12:02:20 +02:00
46fe2e3e2a
fix merge conflicts
2012-05-07 11:47:14 +02:00
1945cd6946
ported the oc_template class
2012-05-06 23:00:36 +02:00
2488cdb8a1
Calendar: Fixed image paths.
2012-05-06 19:19:16 +02:00
9dbc6b5158
Correct wrong DB quotes for calendar share functions
2012-05-06 15:41:14 +00:00
c996600786
push changes
2012-05-05 22:54:14 +02:00
aa4f01fbcc
fix pathes for cal andcarddav
2012-05-05 18:58:58 +02:00
4b4c3c3f3a
remove debug messages
2012-05-05 18:58:58 +02:00
101406eba7
fix writing in remote folder
2012-05-05 18:29:26 +02:00
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
9bcc5c11a8
porting the hooks and starting with the templates
2012-05-05 10:18:45 +02:00
1fef13b0c0
Calendar: Use array_merge to join event arrays
2012-05-04 17:34:13 +02:00
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
2296521a2e
Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116
2012-05-04 11:16:29 +02:00
07ff1e723a
Calendar: Fix repeating events
2012-05-03 23:33:44 +02:00
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
97a8af7f25
ported oc_db
2012-05-03 13:06:08 +02:00
43caa3b3b9
ported oc_json
2012-05-03 12:23:29 +02:00
351740601a
port oc_response
2012-05-03 10:46:27 +02:00
4fe90f62f4
port checkAppEnabled
2012-05-02 19:08:37 +02:00
eec7c3833c
fix install
2012-05-02 19:02:41 +02:00
da03d05700
create folder 'remote' for the remote services like caldav, carddav and webdav
2012-05-02 16:41:23 +02:00
82a61e2e1a
port oc_preferences
2012-05-02 15:54:34 +02:00
ff66600bc0
port appconfig
2012-05-02 14:11:29 +02:00
2fe646dcec
ported the oc_app calls
2012-05-02 00:50:26 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
e48f511606
port linkto and serverHost
2012-05-01 23:19:39 +02:00
31e32e3c10
ported checkLoggedIn and checkAdmin
2012-05-01 22:59:38 +02:00
1a2bbd2ee4
ported addSyript and other small stuff
2012-05-01 20:03:41 +02:00
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
70cea18cce
ported getUser
2012-05-01 18:50:31 +02:00
5bf69237b2
ported isLoggedIn
2012-05-01 18:46:15 +02:00
d0554bef06
finish porting of the LOG calls or the apps to the public api
2012-05-01 17:38:27 +02:00
f817ff573e
Merge branch 'master' into calendar_repeat
2012-05-01 16:18:55 +02:00
f75a7c084f
add class for repeating events
2012-05-01 16:16:12 +02:00
e8ec999090
port to use the new public api
2012-05-01 09:49:22 +02:00
8a3d41c043
fix a PHP Notice
2012-04-30 21:46:33 +02:00
6c908a4cd0
fix path in calendars geo.js
2012-04-30 21:18:54 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
5fda0e4b3b
make *DAV work with movable apps
2012-04-26 21:56:29 +02:00
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
6c554d0ffa
Calendar: Fix calendar export link
2012-05-06 00:35:49 +02:00
d854e4a144
Calendar: fix return of insert id
2012-05-05 22:32:55 +02:00
9092692b8e
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
10eea3f464
fix pathes of shared calendars
2012-04-23 20:13:55 +02:00
e888f4d9bc
Merge branch 'master' into sabredav_1.6
2012-04-22 13:20:50 +02:00
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
1bba445642
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
0918fc7d91
fix merge conflicts
2012-04-21 23:21:50 +02:00
74e5402711
fix a php notice
2012-04-21 22:27:19 +02:00
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
3706bbec1b
Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105
2012-04-19 20:30:58 +02:00
de71842888
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
8959e0af3d
implement shared calendar activation on js-side
2012-04-18 11:39:00 +02:00
7402543d3e
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
77cefdedb8
Merge branch 'master' into sabredav_1.6
2012-04-15 22:28:11 +02:00
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
0b426b5e64
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
9b1d6246a9
Remove useless, unmaintained dav.php
2012-04-15 16:50:44 +02:00
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
029e1aced7
Tasks: Update to use new categories interface
2012-04-14 14:55:37 +02:00
3babb8c22c
improve flexibility of search providers a bit
2012-04-14 11:29:54 +02:00
e256ac8791
fix unsharing of events
2012-04-13 21:49:24 -04:00
c65adc12d5
add chosen script to calendar
2012-04-13 21:29:51 -04:00
5d4c546693
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
ea3499a712
fix class name
2012-04-13 17:26:34 -04:00
1e0364baa8
check permission check in share function
2012-04-13 17:16:28 -04:00
77a9e343aa
Merge branch 'master' into sabredav_1.6
2012-04-13 16:42:10 -04:00
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
02dc343209
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
854eaff34f
hide share tab in shared events
2012-04-13 16:20:19 -04:00
4c52007996
Calendar: Update category list when updating/adding event
2012-04-13 21:13:58 +02:00
471e735b0c
Calendar: Document active parameter in allCalendars
2012-04-13 21:13:58 +02:00
7cf7d5c3dd
Calendar: Also set repeat options when editing a non repeating event
2012-04-13 21:13:58 +02:00
28e0d64ede
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
f9b7ed3a1f
Calendar: Implement rescan of Categories
2012-04-13 21:13:58 +02:00
6aee6dae6b
VCategories css is now in styles.css
2012-04-13 18:50:40 +02:00
df2e788a1c
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
a7908ba76b
fix bugs in share class
2012-04-12 22:11:48 -04:00
9165b5c28e
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
b2011bd0a0
Remove unused function getCategoryOptions from OC_Calendar_Object
2012-04-12 23:10:49 +02:00
0f16935763
fix bugs and optimize OC_Calendar_Object Class
2012-04-11 10:21:45 -04:00
64d3301523
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
eaa649cfb2
fix bug in share lib of calendar
2012-04-10 11:18:02 -04:00
9294a95438
fix view of single shared events
2012-04-07 22:54:38 -04:00
960553f9c4
fix path and class name
2012-04-07 22:45:44 -04:00
5a4237a31d
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
97d216c94d
add dropdown to eventform
2012-04-07 22:40:20 -04:00
4d884c3849
clean up events.php of calendar
2012-04-07 22:39:37 -04:00
e940152bce
fix bugs in share lib of calendar
2012-04-07 22:39:02 -04:00
eef9a1e7ed
add access check to ajax files
2012-04-07 22:37:26 -04:00
e18c0d54f6
add output functions and access function to app.php of calendar
2012-04-07 22:35:29 -04:00
72a43b3929
revert 0fd8b1a044
2012-04-02 08:32:27 -04:00
d896c19011
cal import should group events by uid, export should have correct newlines, fix for oc-384
2012-03-31 20:16:42 -07:00
0fd8b1a044
fix events.php for rewritten OC_Caledar_App class
2012-03-31 16:16:34 -04:00
ca2c7001c4
remove unused code in OC_Calendar_App class
2012-03-31 16:15:04 -04:00
70237f7ecc
rewrite OC_Calendar_APP class
2012-03-31 16:13:04 -04:00
10fc51dc92
add public sharing fir calendars and events - add function in Share class
2012-03-31 16:12:27 -04:00
cf26f8a6a7
add public sharing for calendars and events
2012-03-31 17:32:43 +01:00
4b3f074309
add new parameters to export file
2012-03-31 17:27:30 +01:00
1f8cf2d8f2
fix name of constants
2012-03-31 13:37:44 +02:00
a88305b4cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
90286353e2
Merge branch 'master' into sabredav_1.6
2012-03-29 23:20:03 +02:00
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
08b4f996d3
add backslash r to the newline var
2012-03-28 17:06:16 +02:00
c384e3ba4f
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
f479105f5e
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
10ef01b04b
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
8b9d439841
Calendar: fix address for import file
2012-03-26 15:37:47 +02:00
179bf15daf
fix group sql generator in calendar's share lib
2012-03-26 15:30:04 +02:00
71b32f7ad4
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
Georg Ehrke
Brice Maron
Thomas Tanghus
Robin Appelman
Bjoern Schiessle
Bart Visscher
Frank Karlitschek
Thomas Mueller
Jakob Sack
Scott Shambarger