Bart Visscher
|
980a0893f0
|
Change colorselector to use border for selected color
|
2011-10-07 16:03:26 +02:00 |
Marvin Thomas Rabe
|
e345fbd386
|
conflicts solved
|
2011-10-06 22:40:11 +02:00 |
|
Marvin Thomas Rabe
|
bb26fe9300
|
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
|
2011-10-06 22:37:06 +02:00 |
|
Bart Visscher
|
3cc7212c82
|
Add icon for calendar color selector
|
2011-10-06 21:22:55 +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 |
Georg Ehrke
|
bf017fb4bd
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-06 13:21:38 +02:00 |
|
Georg Ehrke
|
55ab68a332
|
support of RRULE in calendar app
|
2011-10-06 13:21:13 +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
|
7579fc7bc9
|
updated margins
|
2011-10-04 21:39:13 +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
|
77e12a15b1
|
fix checkLoggedIn function in import of ical files
|
2011-10-03 22:52:13 +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
|
1ea183a0f7
|
fix duration bug
|
2011-10-01 21:09:08 +02:00 |
|
Georg Ehrke
|
8219516ec0
|
removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time
|
2011-10-01 20:44:08 +02:00 |
|
Georg Ehrke
|
50007f2d40
|
removed bug, that you can't change time in week view, when event was an allday event
|
2011-10-01 20:36:20 +02:00 |
|
Georg Ehrke
|
a7431d99e5
|
remove debugging text in drag and drop function
|
2011-10-01 20:31:58 +02:00 |
|
Georg Ehrke
|
43a3e46369
|
added drag and drop function for events in calendar app
|
2011-10-01 20:27:30 +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
|
ddd28aae67
|
Remove test data from calendar creation
|
2011-09-30 23:17:30 +02:00 |
|
Bart Visscher
|
f4782a7690
|
Check if the application is actually enabled
|
2011-09-30 23:17:18 +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
|
5875b50de0
|
Use .empty function instead of .html("")
|
2011-09-28 23:17:26 +02:00 |
|
Bart Visscher
|
7c20aea96c
|
Use OC.filePath to locate ajax entry points
|
2011-09-28 23:17:25 +02:00 |
|
Bart Visscher
|
3f7d964acd
|
Color event background with calendar color
|
2011-09-28 23:17:25 +02:00 |
|
Bart Visscher
|
45c983e899
|
Add missing datetime type
|
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
|
8e42b02a22
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-09-28 10:29:07 +02:00 |
|
Georg Ehrke
|
8c405a59d8
|
little bug fixes in calendar app
|
2011-09-28 23:28:14 +02:00 |
|
Bart Visscher
|
c6f78fbe43
|
Add flag in info.xml to control the apps that are installed by default
|
2011-09-27 22:36:14 +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 |
Jan-Christoph Borchardt
|
700ac75565
|
updated translations
|
2011-09-24 23:12:18 +02:00 |
|
Georg Ehrke
|
4aeb2990c0
|
delete calendar function for userinterface
|
2011-09-24 19:52:55 +02:00 |