Commit Graph

203 Commits

Author SHA1 Message Date
Georg Ehrke 4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Georg Ehrke e154806838 fix another ui bug of calendar 2012-06-13 22:20:43 +02:00
Georg Ehrke 2e44ffaf02 another ui fix 2012-06-13 22:14:40 +02:00
Georg Ehrke b1139e977a fix a ui bug for calendar sharing 2012-06-13 22:12:54 +02:00
Georg Ehrke 7d29bee859 fix merge conflicts 2012-06-13 21:40:05 +02:00
Bart Visscher 4da6b3a391 Calendar: Make button of #datecontrol_date 2012-06-13 21:39:12 +02:00
Michael Gapczynski 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
Georg Ehrke 66c3ddcd74 Merge branch 'master' into calendar_repeat 2012-06-11 22:18:46 +02:00
Bart Visscher eddad8bedb Calendar: remove unused markup from #controls 2012-06-11 20:34:06 +02:00
Lukas Reschke 68f819ee20 Removed double sanitization 2012-06-11 19:47:42 +02:00
Lukas Reschke ad36fc8938 Fix double sanitization 2012-06-11 19:43:37 +02:00
Lukas Reschke 6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Georg Ehrke ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Georg Ehrke e7f6f7e452 fix another XSS 2012-06-09 16:45:37 +02:00
Georg Ehrke c9214afff8 fix XSS in Calendar 2012-06-09 16:35:35 +02:00
Georg Ehrke 65cd15ca15 fix merge conflicts 2012-06-08 11:21:55 +02:00
Thomas Tanghus e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +02:00
Georg Ehrke 2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Bart Visscher 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
Georg Ehrke e75146a811 Merge branch 'master' into calendar_repeat 2012-06-01 11:40:39 +02:00
Georg Ehrke f0bd571866 fix potential XSS 2012-05-31 20:01:12 +02:00
Georg Ehrke 482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke 6146b6a131 fix paths to images and set height for calendar management dialog 2012-05-17 21:51:38 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Georg Ehrke 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
Georg Ehrke 85cc34fd05 fix another php notice 2012-05-13 12:14:08 +02:00
Georg Ehrke a589a700e1 revert 000d7ba975 2012-05-09 18:34:44 +02:00
Georg Ehrke 000d7ba975 fix bug in calendar 2012-05-09 11:53:16 +02:00
Bart Visscher 4dbc2093c6 Create a function for linking to remote.php 2012-05-07 21:47:14 +02:00
Georg Ehrke ef073a148f make calendar compatible with public.php 2012-05-07 15:48:41 +02:00
Georg Ehrke b125caaaf6 fix path of caldav in calendar management 2012-05-07 12:16:25 +02:00
Georg Ehrke ef10603c26 fix pathes in calendar and contacts 2012-05-07 12:02:20 +02:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Thomas Tanghus 2488cdb8a1 Calendar: Fixed image paths. 2012-05-06 19:19:16 +02:00
Bart Visscher 6c554d0ffa Calendar: Fix calendar export link 2012-05-06 00:35:49 +02:00
Georg Ehrke aa4f01fbcc fix pathes for cal andcarddav 2012-05-05 18:58:58 +02:00
Georg Ehrke 4b4c3c3f3a remove debug messages 2012-05-05 18:58:58 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek 93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Georg Ehrke 9092692b8e make calendar work with movable apps 2012-04-23 20:32:55 +02:00
Georg Ehrke 1bba445642 hide alarm and attendees tab 2012-04-22 13:15:24 +02:00
Thomas Tanghus 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
Georg Ehrke 74e5402711 fix a php notice 2012-04-21 22:27:19 +02:00
Georg Ehrke de71842888 implement shared calendar activation on server side 2012-04-18 11:50:12 +02:00
Georg Ehrke 7402543d3e resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts 2012-04-18 09:53:54 +02:00
Georg Ehrke dc18e65b46 fix merge conflicts 2012-04-15 22:26:55 +02:00
Jakob Sack 0b426b5e64 Display correct URL in caldav and carddav paths 2012-04-15 16:50:45 +02:00