Marvin Thomas Rabe
|
e345fbd386
|
conflicts solved
|
2011-10-06 22:40:11 +02:00 |
Bart Visscher
|
4786ed321e
|
Replace _ in timezone setting with a space
|
2011-10-06 13:22:36 +02:00 |
|
Bart Visscher
|
c28f1e0276
|
Implement timezone fix from Stephen Rees-Carter
|
2011-10-06 13:22:36 +02:00 |
Stephen Rees-Carter
|
c853fc75a1
|
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
|
2011-10-06 10:31:05 +11:00 |
Jan-Christoph Borchardt
|
8e532b5ceb
|
removed extra calendar settings. Also, table layout?
|
2011-10-05 14:32:25 +02:00 |
|
Marvin Thomas Rabe
|
340f6bbaba
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-04 19:37:54 +02:00 |
|
Marvin Thomas Rabe
|
d1518f2901
|
updated calendar settings
|
2011-10-04 19:37:26 +02:00 |
Georg Ehrke
|
33b660857a
|
fix ical import
|
2011-10-04 10:17:11 +02:00 |
|
Georg Ehrke
|
c40a1fcede
|
added import function as filehandler
|
2011-10-03 22:50:10 +02:00 |
|
Bart Visscher
|
dec8106665
|
Add user friendly calendar color chooser
|
2011-10-03 20:42:47 +02:00 |
|
Bart Visscher
|
6159b79715
|
Take setting default value out of loop
|
2011-10-03 20:42:47 +02:00 |
|
Marvin Thomas Rabe
|
bdcf31cc73
|
Added translatable text.
|
2011-10-02 16:06:30 +02:00 |
|
Marvin Thomas Rabe
|
213275a1f8
|
Add translation and fixed some css problems
|
2011-10-02 15:55:23 +02:00 |
|
Marvin Thomas Rabe
|
daee88fd26
|
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
|
0ebe9ad70c
|
added function to export single events
|
2011-10-01 23:19:06 +02:00 |
|
Georg Ehrke
|
f9824f6108
|
choosable default duration of event
|
2011-10-01 22:53:18 +02:00 |
|
Georg Ehrke
|
bf6414d3ad
|
choosable time format
|
2011-10-01 10:39:07 +02:00 |
|
Georg Ehrke
|
0514a1925b
|
choosable first day of week & choosable days of weekend
|
2011-10-01 09:54:52 +02:00 |
|
Bart Visscher
|
d59c48217d
|
Change colspan in choose calendar dialog to 6
|
2011-09-29 22:15:42 +02:00 |
|
Bart Visscher
|
f29f601ec4
|
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 59d4ddd905.
|
2011-09-28 23:25:22 +02:00 |
|
Bart Visscher
|
c9c7d5e1aa
|
Add support for DURATION in VEVENT
|
2011-09-28 23:17:26 +02:00 |
|
Bart Visscher
|
3f7d964acd
|
Color event background with calendar color
|
2011-09-28 23:17:25 +02:00 |
|
Jan-Christoph Borchardt
|
c39c6d36df
|
do not use 'URL' but 'address'
|
2011-09-28 22:11:47 +02:00 |
|
Georg Ehrke
|
61c4f9b3c8
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-09-28 18:44:17 +02:00 |
|
Georg Ehrke
|
59d4ddd905
|
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
|
98c59605aa
|
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
|
61aa00899d
|
show only most essential stuff in add and edit event form
|
2011-09-27 21:56:16 +02:00 |
|
Bart Visscher
|
17e631bc5e
|
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
|
4aeb2990c0
|
delete calendar function for userinterface
|
2011-09-24 19:52:55 +02:00 |
Florian Pritz
|
b0e23a1634
|
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
|
6f3c118038
|
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
|
782069e1fa
|
Change copyright notice to short form
|
2011-09-23 22:59:54 +02:00 |
|
Bart Visscher
|
5741811d36
|
Fix use of reserved javascript keyword 'new'
|
2011-09-23 22:22:03 +02:00 |
Jan-Christoph Borchardt
|
aa4aa40b57
|
fixed a few calendar words, hack to get shortcode for May translatable
|
2011-09-23 20:19:39 +02:00 |
|
Bart Visscher
|
e9950defb2
|
Make event category choice multiselect
|
2011-09-23 19:40:06 +02:00 |
|
Bart Visscher
|
d5656716f6
|
Fix calendar active checkbox
|
2011-09-18 17:13:48 +02:00 |
|
Bart Visscher
|
079df42103
|
Disable the Oneday and Fourweeks buttons in calendar interface
|
2011-09-17 01:55:04 +02:00 |
|
Bart Visscher
|
2a84f7f07c
|
Move most javascript to calendar.js
|
2011-09-16 17:50:55 +02:00 |
|
Bart Visscher
|
45d42a9654
|
Move validateEventForm function and fix success handling
|
2011-09-16 17:06:57 +02:00 |
|
Bart Visscher
|
73d3dc91fd
|
Handle multi open of choosecalendar dialog
|
2011-09-16 14:11:22 +02:00 |
|
Bart Visscher
|
0fde26c86c
|
Close event new/edit dialog when clicking outside the dialog
|
2011-09-16 14:02:21 +02:00 |
|
Bart Visscher
|
2353f02d9a
|
Fixes for Calendar app
|
2011-09-16 00:21:51 +02:00 |
|
Bart Visscher
|
15559d3e88
|
First implementation of edit event
|
2011-09-16 00:21:19 +02:00 |
|
Bart Visscher
|
388b14604a
|
Move Calendar Object code to its own class OC_Calendar_Object
|
2011-09-16 00:19:43 +02:00 |
|
Bart Visscher
|
b6c69e580a
|
Move php code out of part.eventform
|
2011-09-14 23:36:23 +02:00 |
|
Bart Visscher
|
cb9a67906d
|
Move event form field to part.eventform template
|
2011-09-14 23:36:23 +02:00 |
|
Bart Visscher
|
68758f9b2c
|
Rename calendar javascript functions into Calendar.UI namespace
|
2011-09-14 23:36:22 +02:00 |
Bart Visscher
|
7c9f1007d5
|
Fix initial visibility of database settings in setup
|
2011-09-14 23:36:22 +02:00 |
|
Jan-Christoph Borchardt
|
de729d8d8b
|
renamed last CW to Week
|
2011-09-11 21:50:13 +02:00 |
|
Bart Visscher
|
cd44dff5af
|
Better feedback for saving calendar and openid settings
|
2011-09-11 20:38:52 +02:00 |