Michael Gapczynski
65e2990c28
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
Georg Ehrke
581774d5dd
Merge branch 'master' into calendar_repeat
2012-06-11 22:18:46 +02:00
Bart Visscher
4932e4596c
Calendar: remove unused markup from #controls
2012-06-11 20:34:06 +02:00
Lukas Reschke
270f1ceac0
Removed double sanitization
2012-06-11 19:47:42 +02:00
Lukas Reschke
838b6a55e6
Fix double sanitization
2012-06-11 19:43:37 +02:00
Lukas Reschke
07b1c0637e
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
Georg Ehrke
775f8c9e2e
fix merge conflicts
2012-06-10 18:38:01 +02:00
Georg Ehrke
e504ff39c5
fix another XSS
2012-06-09 16:45:37 +02:00
Georg Ehrke
35b22d35f2
fix another XSS
2012-06-09 16:44:48 +02:00
Georg Ehrke
2f31f83492
fix XSS in Calendar
2012-06-09 16:36:01 +02:00
Georg Ehrke
3707beda1b
fix XSS in Calendar
2012-06-09 16:35:35 +02:00
Georg Ehrke
4b0f8a544e
fix merge conflicts
2012-06-08 11:21:55 +02:00
Thomas Tanghus
27a237463f
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:22:25 +02:00
Thomas Tanghus
6834adbf81
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
Georg Ehrke
eb0e970e53
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
Bart Visscher
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
Georg Ehrke
8f4c7b48f7
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
Georg Ehrke
c6f928f472
fix potential XSS
2012-05-31 20:03:15 +02:00
Georg Ehrke
3ec102403d
fix potential XSS
2012-05-31 20:01:12 +02:00
Georg Ehrke
281933f8fa
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
Georg Ehrke
14d9bb4242
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
Thomas Mueller
4af9ab5d8d
removing executable bit - again
2012-05-15 00:52:00 +02:00
Georg Ehrke
263f4db359
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
385dd7326b
fix another php notice
2012-05-13 12:14:08 +02:00
Georg Ehrke
88248a7a9c
revert 000d7ba97535f470f30be44e02140401b24b43e2
2012-05-09 18:34:44 +02:00
Georg Ehrke
208519275e
fix bug in calendar
2012-05-09 11:53:16 +02:00
Bart Visscher
e57f900035
Create a function for linking to remote.php
2012-05-07 21:47:14 +02:00
Georg Ehrke
b7a8860a1c
make calendar compatible with public.php
2012-05-07 15:48:41 +02:00
Georg Ehrke
627d713d71
fix path of caldav in calendar management
2012-05-07 12:16:25 +02:00
Georg Ehrke
7b8778a6fb
fix pathes in calendar and contacts
2012-05-07 12:02:20 +02:00
Frank Karlitschek
18df979721
ported the oc_template class
2012-05-06 23:00:36 +02:00
Thomas Tanghus
7e7f8e7c08
Calendar: Fixed image paths.
2012-05-06 19:19:16 +02:00
Bart Visscher
acb8f7e550
Calendar: Fix calendar export link
2012-05-06 00:35:49 +02:00
Georg Ehrke
39bf24bc11
fix pathes for cal andcarddav
2012-05-05 18:58:58 +02:00
Georg Ehrke
47870099f4
remove debug messages
2012-05-05 18:58:58 +02:00
Frank Karlitschek
7ff262880f
port oc_preferences
2012-05-02 15:54:34 +02:00
Frank Karlitschek
b6f22ec751
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
Frank Karlitschek
b0dd824e49
port linkto and serverHost
2012-05-01 23:19:39 +02:00
Frank Karlitschek
178e107740
ported getUser
2012-05-01 18:50:31 +02:00
Thomas Mueller
3f052f6d20
removing executable bit from various files
2012-04-30 12:05:57 +02:00
Georg Ehrke
6a503dfcc7
make calendar work with movable apps
2012-04-23 20:32:55 +02:00
Georg Ehrke
47411d704f
hide alarm and attendees tab
2012-04-22 13:15:24 +02:00
Thomas Tanghus
65c0cc2e63
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
Georg Ehrke
07caa2456c
fix a php notice
2012-04-21 22:27:19 +02:00
Georg Ehrke
a42f4aadeb
implement shared calendar activation on server side
2012-04-18 11:50:12 +02:00
Georg Ehrke
f18ad251b1
resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts
2012-04-18 09:53:54 +02:00
Georg Ehrke
cccab23ecc
fix merge conflicts
2012-04-15 22:26:55 +02:00
Jakob Sack
d7715c43ce
Display correct URL in caldav and carddav paths
2012-04-15 16:50:45 +02:00
Georg Ehrke
4572b2dd40
fix unsharing of events
2012-04-13 21:49:24 -04:00
Georg Ehrke
7640ab0867
fix public sharing of calendars
2012-04-13 17:36:47 -04:00
Georg Ehrke
9b737c25bc
fix merge conflicts
2012-04-13 16:40:10 -04:00
Georg Ehrke
0fc3e25cc2
fix address of public shared calendars
2012-04-13 16:26:06 -04:00
Georg Ehrke
262f0509b0
hide share tab in shared events
2012-04-13 16:20:19 -04:00
Bart Visscher
bbc6be3863
Calendar: Fix saving of Categories in an event
2012-04-13 21:13:58 +02:00
Georg Ehrke
e46aa1adb2
fix calendarid in eventform and validation of calendarid
2012-04-12 23:15:19 -04:00
Bart Visscher
97a96c51b2
Use the same category input and management as the contacts app
2012-04-12 23:10:49 +02:00
Georg Ehrke
6c86bf89fc
make shared events editable and add (empty) classes for alarm and attendees
2012-04-10 16:03:38 -04:00
Georg Ehrke
28363a67de
make dropdown menu work with single event sharing
2012-04-07 22:41:24 -04:00
Georg Ehrke
9b83b3f15a
add dropdown to eventform
2012-04-07 22:40:20 -04:00
Georg Ehrke
b8977017cb
remove share tab from read only event dialog
2012-03-31 13:11:30 +02:00
Georg Ehrke
e8d997de4e
fix width of dropdown to select monthdays - bugfix oc-354
2012-03-27 09:24:55 +02:00
Georg Ehrke
29a9a82902
optimize choosecalendar dialog for shared calendars
2012-03-26 16:01:55 +02:00
Georg Ehrke
37d9ad6558
fix displayed username of person who shares
2012-03-26 15:44:24 +02:00
Georg Ehrke
b0b82c8fae
add read only 'form' for shared events
2012-03-26 15:24:43 +02:00
Georg Ehrke
501c853b99
Merge branch 'master' into calendar_sharing
2012-03-17 13:59:00 +01:00
Tom Needham
51bc137bbf
Dont truncate the time format
2012-03-17 12:41:16 +00:00
Georg Ehrke
b51c938c08
fix merge conflicts
2012-03-03 15:06:51 +01:00
Georg Ehrke
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
Georg Ehrke
11505801a9
fix merge conflicts
2012-02-25 16:54:27 +01:00
Marvin Thomas Rabe
5ed9c91008
Calendar selection only available if there are more than one.
2012-02-23 22:28:14 +01:00
Georg Ehrke
b800510d75
change links in the event form for the new ajax folders
2012-02-23 22:07:08 +01:00
Georg Ehrke
318d123944
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-23 22:06:43 +01:00
Georg Ehrke
467da0f2ac
change links in the event form for the new ajax folders
2012-02-21 19:16:14 +01:00
Georg Ehrke
8115b3336c
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
Bart Visscher
32afe71f0e
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
Georg Ehrke
e711f82588
fix sharing calendar manager
2012-02-11 13:30:15 +01:00
Georg Ehrke
c87dc297f2
Merge branch 'master' into calendar
2012-02-04 21:34:38 +01:00
Georg Ehrke
2a71a8de29
Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar
2012-02-04 21:27:18 +01:00
Georg Ehrke
733e4e3e82
add sharing management for calendars
2012-02-04 21:23:31 +01:00
Georg Ehrke
aa8ae1f191
add a label calendar to the settings page - bugfix for oc-157
2012-02-02 18:37:06 +01:00
Georg Ehrke
26027dde91
fix merge conflicts
2012-02-02 17:48:29 +01:00
Georg Ehrke
182f022e0b
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
Georg Ehrke
b501665b6f
Calendar: fix html of import dialog
2012-01-31 22:03:08 +01:00
Georg Ehrke
a153872bde
add share as a tab
2012-01-31 21:39:40 +01:00
Georg Ehrke
4d5762d9c2
make tab names translatable
2012-01-31 17:15:25 +01:00
Georg Ehrke
c733e188fc
add alarm as a tab
2012-01-31 16:59:34 +01:00
Georg Ehrke
38334aac14
add tabs for repeating and attendees in the event form
2012-01-31 11:57:09 +01:00
Georg Ehrke
56d8fc5c33
remove debug file
2012-01-29 16:08:09 +01:00
Bart Visscher
0cbcf34352
[Calendar] Use class for active view button
2012-01-19 21:00:19 +01:00
Georg Ehrke
6d502a892b
move loading icon to the top bar
2012-01-17 19:48:29 +01:00
Georg Ehrke
5c928f48e4
use button for new calendar
2012-01-17 19:09:11 +01:00
Georg Ehrke
e2c8455352
fix ocbug 34
2012-01-17 15:38:32 +01:00
Georg Ehrke
f09c1d93b6
fix ocbug 24
2012-01-17 15:18:01 +01:00
Georg Ehrke
1a9506dc6c
highlight the current view
2012-01-15 00:06:26 +01:00
Georg Ehrke
612c48d90c
improve import function
2012-01-14 14:22:30 +01:00
Georg Ehrke
e74f0704ce
improve import form for calendar
2012-01-13 13:57:46 +01:00
Georg Ehrke
8c73a0782f
update calendar pot file
2012-01-07 18:30:32 +01:00
Georg Ehrke
6fab9b4aa3
fix search function
2012-01-07 14:31:47 +01:00
Georg Ehrke
05e29d6f9d
improve search function
2012-01-06 14:36:24 +01:00
Georg Ehrke
2a57536e20
add function to detect always the timezone
2012-01-02 11:35:50 +01:00
Georg Ehrke
6d29f06540
Merge branch 'master' into calendar
2011-12-29 19:16:33 +01:00
Bart Visscher
b600b5b72c
Calendar: add loading indicator
2011-12-27 21:50:31 +01:00
Georg Ehrke
aa7187c6c7
make repeating events editable
2011-12-25 23:19:49 +01:00
Georg Ehrke
372493d1ba
fix timeformat setting for fullcalendar
2011-11-20 14:23:26 +01:00
Georg Ehrke
83a386adf3
another fix of caldav url
2011-11-12 16:13:27 +01:00
Georg Ehrke
53d175244c
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
Georg Ehrke
5ee8b0953c
fix caldav url
2011-11-12 14:06:14 +01:00
Georg Ehrke
aa7cedd6c6
automatic timezone detection
2011-11-11 15:51:44 +01:00
Bart Visscher
2ccca89286
Use a function to generate select options
2011-11-09 22:19:52 +01:00
Bart Visscher
323008792a
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
Georg Ehrke
8c9b429ca8
translatable error messages
2011-10-22 13:14:54 +02:00
Bart Visscher
3f92c6680a
Fix changing calendar data
2011-10-20 23:49:28 +02:00
Bart Visscher
50757ce241
Connect newEvent & editEvent to fullcalendar
2011-10-20 23:49:28 +02:00
Bart Visscher
edd0386443
Translation of calendar interface
2011-10-20 23:49:27 +02:00
Bart Visscher
d896373c0f
Connect calendar buttons to actions
2011-10-20 23:49:27 +02:00
Bart Visscher
fdfad27bf2
Implement loading of events in calendar
2011-10-20 23:49:27 +02:00
Bart Visscher
ef36d15c73
Replace ownCloud calendar html with fullcalendar implementation
2011-10-20 23:49:27 +02:00
Marvin Thomas Rabe
ef7d8c26ca
removed description field for calendar
2011-10-08 13:28:01 +02:00
Marvin Thomas Rabe
426250e3da
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
Marvin Thomas Rabe
a886cfa518
conflicts solved
2011-10-06 22:40:11 +02:00
Bart Visscher
f5f71e2a0f
Replace _ in timezone setting with a space
2011-10-06 13:22:36 +02:00
Bart Visscher
12d6ef7527
Implement timezone fix from Stephen Rees-Carter
2011-10-06 13:22:36 +02:00
Stephen Rees-Carter
1179fdf62f
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
2011-10-06 10:31:05 +11:00
Jan-Christoph Borchardt
b87cff26e1
removed extra calendar settings. Also, table layout?
2011-10-05 14:32:25 +02:00
Marvin Thomas Rabe
07fc663383
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 19:37:54 +02:00
Marvin Thomas Rabe
6a2026098d
updated calendar settings
2011-10-04 19:37:26 +02:00
Georg Ehrke
4bed62ce02
fix ical import
2011-10-04 10:17:11 +02:00
Georg Ehrke
d88bd1a5ce
added import function as filehandler
2011-10-03 22:50:10 +02:00
Bart Visscher
f7b79a43c7
Add user friendly calendar color chooser
2011-10-03 20:42:47 +02:00
Bart Visscher
238a0f52a0
Take setting default value out of loop
2011-10-03 20:42:47 +02:00
Marvin Thomas Rabe
4d7c4c73bf
Added translatable text.
2011-10-02 16:06:30 +02:00
Marvin Thomas Rabe
6296065b66
Add translation and fixed some css problems
2011-10-02 15:55:23 +02:00
Marvin Thomas Rabe
e639059648
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
2011-10-02 15:51:24 +02:00
Georg Ehrke
ce6281c71d
added function to export single events
2011-10-01 23:19:06 +02:00
Georg Ehrke
66349b225d
choosable default duration of event
2011-10-01 22:53:18 +02:00
Georg Ehrke
ec1a48e25a
choosable time format
2011-10-01 10:39:07 +02:00
Georg Ehrke
e38e410a89
choosable first day of week & choosable days of weekend
2011-10-01 09:54:52 +02:00
Bart Visscher
ccb1c9d990
Change colspan in choose calendar dialog to 6
2011-09-29 22:15:42 +02:00
Bart Visscher
a8fa10287b
Revert "commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)"
...
Implemented the calendar color as background of the events.
This reverts commit 59d4ddd9051c5aaf80140484767ff274d3ce6630.
2011-09-28 23:25:22 +02:00
Bart Visscher
e9d7067755
Add support for DURATION in VEVENT
2011-09-28 23:17:26 +02:00
Bart Visscher
70bea4cc6b
Color event background with calendar color
2011-09-28 23:17:25 +02:00
Jan-Christoph Borchardt
4406417449
do not use 'URL' but 'address'
2011-09-28 22:11:47 +02:00
Georg Ehrke
3c328cec8b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 18:44:17 +02:00
Georg Ehrke
bda67b234f
commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)
2011-09-28 18:43:59 +02:00
Frank Karlitschek
cc24bac0c3
show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration
2011-09-28 16:05:01 +02:00
Georg Ehrke
2a41374e59
show only most essential stuff in add and edit event form
2011-09-27 21:56:16 +02:00
Bart Visscher
0dd0aa70da
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Georg Ehrke
1052816c77
delete calendar function for userinterface
2011-09-24 19:52:55 +02:00
Florian Pritz
6e2b068109
apps/calendar: add delete button to edit event form
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:51 +02:00
Florian Pritz
7e38931491
apps/calendar: check if variables are set before using them
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:42 +02:00
Bart Visscher
2419c1af84
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
Bart Visscher
a68474bacf
Fix use of reserved javascript keyword 'new'
2011-09-23 22:22:03 +02:00
Jan-Christoph Borchardt
33c100c6a6
fixed a few calendar words, hack to get shortcode for May translatable
2011-09-23 20:19:39 +02:00
Bart Visscher
37c0dbed44
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
Bart Visscher
d5b2115ce4
Fix calendar active checkbox
2011-09-18 17:13:48 +02:00
Bart Visscher
6dde84e916
Disable the Oneday and Fourweeks buttons in calendar interface
2011-09-17 01:55:04 +02:00
Bart Visscher
841040fe6e
Move most javascript to calendar.js
2011-09-16 17:50:55 +02:00
Bart Visscher
7ae512959b
Move validateEventForm function and fix success handling
2011-09-16 17:06:57 +02:00
Bart Visscher
7222fb9a65
Handle multi open of choosecalendar dialog
2011-09-16 14:11:22 +02:00
Bart Visscher
14bfa4d3da
Close event new/edit dialog when clicking outside the dialog
2011-09-16 14:02:21 +02:00
Bart Visscher
42b25d8d0d
Fixes for Calendar app
2011-09-16 00:21:51 +02:00
Bart Visscher
b877dea2e4
First implementation of edit event
2011-09-16 00:21:19 +02:00
Bart Visscher
7484603ba8
Move Calendar Object code to its own class OC_Calendar_Object
2011-09-16 00:19:43 +02:00
Bart Visscher
2fb4f57331
Move php code out of part.eventform
2011-09-14 23:36:23 +02:00
Bart Visscher
7a35af5962
Move event form field to part.eventform template
2011-09-14 23:36:23 +02:00
Bart Visscher
bc610f6a82
Rename calendar javascript functions into Calendar.UI namespace
2011-09-14 23:36:22 +02:00
Bart Visscher
2a8964fb7e
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
Jan-Christoph Borchardt
1036def112
renamed last CW to Week
2011-09-11 21:50:13 +02:00
Bart Visscher
45aa9ec1e2
Better feedback for saving calendar and openid settings
2011-09-11 20:38:52 +02:00
Bart Visscher
314f0cb97a
Correct copyright notices
2011-09-11 17:25:02 +02:00
Bart Visscher
ba20075fac
Fix a warning and an error
2011-09-10 11:58:08 +02:00
Georg Ehrke
c538ca4f82
translatable categories and other translations added
2011-09-09 20:39:38 +02:00
Georg Ehrke
cd2740c5bd
show caldav url in choose calendar dialog
2011-09-09 18:44:33 +02:00
Bart Visscher
b933e89626
Add creating calendars with the web interface
2011-09-08 12:29:29 +02:00
Bart Visscher
99b905b637
Implement calendar list view
2011-09-07 15:13:26 +02:00
Bart Visscher
a06f653dbb
Eliminate most global calendar js vars
2011-09-07 09:49:23 +02:00
Bart Visscher
a1676efb6e
Store date for click in jQuery.data('date_info')
2011-09-07 09:49:23 +02:00
Jan-Christoph Borchardt
aa4faf1dd0
small wording changes
2011-09-04 18:13:53 +02:00
Bart Visscher
e993087aad
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
Bart Visscher
ea2c04974b
Update calendar event label creation
2011-09-03 22:15:23 +02:00
Bart Visscher
447d1e9901
Fix event creation date in oneweekview
2011-09-02 23:50:51 +02:00
Bart Visscher
202a4cf146
Use css classes to find elements, reduces the html size
2011-09-02 23:28:35 +02:00
Bart Visscher
128cce6ced
Cleanup javascript in calendar template
2011-09-02 23:04:02 +02:00
Georg Ehrke
0f0d20eb1a
bug fixes in new design of calendar
2011-09-02 15:49:03 +02:00
Georg Ehrke
24a0479c2e
export function and style fixes in calendar
2011-09-02 12:55:56 +02:00
Bart Visscher
e9cf63ee5d
Refactor calendar loadEvents and updateView use
2011-09-01 23:27:00 +02:00
Georg Ehrke
d18885af3d
add some categories in calendar
2011-09-01 18:35:32 +02:00
Georg Ehrke
5f49d88da7
bug fixes at new event form (categorie and calendar)
2011-09-01 16:54:25 +02:00
Georg Ehrke
e16a702809
reload page after add event successfully
2011-08-31 20:41:18 +02:00
Georg Ehrke
96bc635c6d
new changes (e.g. show events) by Bart Visscher
2011-08-31 20:20:46 +02:00
Georg Ehrke
4a94c12091
commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar
2011-08-31 17:29:38 +02:00
Georg Ehrke
1e470e6447
first add event function in calendar app
2011-08-28 20:13:40 +02:00
Georg Ehrke
637a1093e0
better multiple language support, first integration of new calendar class
2011-08-23 18:02:36 +02:00
Georg Ehrke
562fda8d40
remove reset button (again)
2011-08-20 22:50:43 +02:00
Georg Ehrke
9ba98a4e16
allday bug fixed
2011-08-20 16:52:03 +02:00
Georg Ehrke
210734da42
bug/style fixes, multiple language support, german language pack
2011-08-20 15:19:43 +02:00
Jan-Christoph Borchardt
f1f53633de
removed unneeded and dangerous reset button
2011-08-19 23:15:27 +02:00
Georg Ehrke
92d723d666
a lot of new functions (e.g. add event form), style fixes, bug fixes
2011-08-19 20:33:48 +02:00
Georg Ehrke
09abf1f153
old files deleted
2011-08-12 14:39:24 +02:00
Georg Ehrke
45daf665ec
bug fixes, style fixes
2011-08-12 14:29:45 +02:00