4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
cb71996008
Change image links to use imagePath function
2012-08-12 22:30:13 +02:00
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
00d7ae8319
move calendar settings from personal settings to in app settings
2012-08-09 12:37:26 +02:00
9580d0ef29
Initial calendar sharing backend
2012-08-07 14:57:52 -04:00
fe6450002d
Change hardcoded urls to use linkTo function
2012-08-06 18:51:41 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
47566b0c42
stop using of OC_L10N::tA
2012-07-16 20:26:14 +02:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
3424785db0
Implemented Sabre iCalendar Export Plugin.
2012-07-08 16:58:17 +02:00
a4c2893128
some more work on calendar import - new import is (nearly) done
2012-07-04 21:14:40 +02:00
c036700c54
some more work on calendar import
2012-07-03 22:33:24 +02:00
29a9559fa9
some work on calendar import dialog
2012-07-03 13:43:18 +02:00
803f2c2517
some work on calendar import
2012-07-01 21:36:09 +02:00
fd23c286ef
Calendar: Fix caldav url encoding
2012-06-21 23:30:04 +02:00
4a22f4ca78
Calendar: convert choosecalendar.rowfields template from plain php to html+php
2012-06-21 23:30:04 +02:00
4767c70578
fix merge conflicts
2012-06-15 11:48:26 +02:00
e154806838
fix another ui bug of calendar
2012-06-13 22:20:43 +02:00
2e44ffaf02
another ui fix
2012-06-13 22:14:40 +02:00
b1139e977a
fix a ui bug for calendar sharing
2012-06-13 22:12:54 +02:00
7d29bee859
fix merge conflicts
2012-06-13 21:40:05 +02:00
4da6b3a391
Calendar: Make button of #datecontrol_date
2012-06-13 21:39:12 +02:00
b5889d6ffe
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
66c3ddcd74
Merge branch 'master' into calendar_repeat
2012-06-11 22:18:46 +02:00
eddad8bedb
Calendar: remove unused markup from #controls
2012-06-11 20:34:06 +02:00
68f819ee20
Removed double sanitization
2012-06-11 19:47:42 +02:00
ad36fc8938
Fix double sanitization
2012-06-11 19:43:37 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +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
65cd15ca15
fix merge conflicts
2012-06-08 11:21:55 +02:00
e1f4978150
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +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
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
f0bd571866
fix potential XSS
2012-05-31 20:01:12 +02:00
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +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
85cc34fd05
fix another php notice
2012-05-13 12:14:08 +02:00
a589a700e1
revert 000d7ba975
2012-05-09 18:34:44 +02:00
000d7ba975
fix bug in calendar
2012-05-09 11:53:16 +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
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
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
Michael Gapczynski
Bart Visscher
Georg Ehrke
Thomas Tanghus
Michael Gapczynski
Lukas Reschke
Thomas Mueller
Frank Karlitschek