Commit graph

1964 commits

Author SHA1 Message Date
Georg Ehrke
5904d5cf50 Merge branch 'remote.php' 2012-05-07 15:07:16 +02:00
Georg Ehrke
1138df0f4b fix webdav, bloody merge conflicts 2012-05-07 12:47:34 +02:00
Georg Ehrke
6bdbcc1f49 fix path of carddav in addressbook management 2012-05-07 12:18:58 +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
Georg Ehrke
46fe2e3e2a fix merge conflicts 2012-05-07 11:47:14 +02:00
Georg Ehrke
7d2a68fc31 make carddav work with remote.php 2012-05-07 11:24:19 +02:00
Florian Hülsmann
8534373f2f better invalid webfinger URI handling 2012-05-07 11:15:24 +02:00
Michiel de Jong
3a184e2e1d whitespace correction in webfinger.php 2012-05-07 09:51:37 +02:00
Michiel de Jong
c4e47953ac require base lib and deal with malformed user addresses in webfinger.php 2012-05-07 09:46:15 +02:00
Michiel de Jong
5155f589fd prevent xss in webfinger 2012-05-07 09:26:54 +02:00
Thomas Tanghus
65b9850e53 Code cleanup. 2012-05-07 04:46:09 +02:00
Michael Gapczynski
471cad7d90 Remove manual file cache insertions of shared files, update mtime of shared folder 2012-05-06 20:14:29 -04:00
Michael Gapczynski
41179a1456 Fix feedback for sharing errors 2012-05-06 19:06:24 -04:00
Brice Maron
333345d201 Add php-pdo to soft depend check 2012-05-06 21:42:33 +00:00
Brice Maron
fe8b10a922 Add php-xml as dependency for core fix oc-364 2012-05-06 21:38:35 +00: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
Thomas Tanghus
5bf69cace1 Contacts: Re-added some styling that got lost in a revert. 2012-05-06 19:19:15 +02:00
Brice Maron
9dbc6b5158 Correct wrong DB quotes for calendar share functions 2012-05-06 15:41:14 +00:00
Thomas Tanghus
bede32be24 Contacts: Fix for Android browser again, again. 2012-05-06 13:51:16 +02:00
Thomas Tanghus
c1019a6e98 Contacts: Resized Add button. Now how do I add a gradient? ;-) 2012-05-06 13:51:16 +02:00
Thomas Tanghus
400ade063c Revert Android positioning 'fix'.
This reverts commit 20f1c1e6ca and 93ae945414.
2012-05-06 13:51:16 +02:00
Thomas Tanghus
f2ec68d40c Revert "Contacts: Fix for leftcontent positioning in Android browser."
This reverts commit 93ae945414.
2012-05-06 13:51:16 +02:00
Bart Visscher
f69f764e8b Working remote.php with webdav and caldav 2012-05-06 00:12:51 +02:00
Georg Ehrke
c996600786 push changes 2012-05-05 22:54:14 +02:00
Georg Ehrke
6c2fc0cbe8 fix writing of webdav.php 2012-05-05 20:43:11 +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
Bart Visscher
24a8451b2e Tasks: Fix addtask for <5.4 php version 2012-05-05 18:48:24 +02:00
Georg Ehrke
101406eba7 fix writing in remote folder 2012-05-05 18:29:26 +02:00
Bart Visscher
2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Bart Visscher
2092caf6d3 Tasks: Fix add task action 2012-05-05 18:16:14 +02:00
Robin Appelman
70cb053e6b improve cryptstream fro writing non-chunksized data 2012-05-05 16:49:48 +02:00
Robin Appelman
d875191777 only emit the filesystem hooks once when creating a new file 2012-05-05 16:49:48 +02:00
Florian Hülsmann
4a7591d0ab Custom icons for contacts app 2012-05-05 16:31:58 +02:00
Thomas Tanghus
74a0df335a Contacts: Make editable fields more discoverable. Align group field vertically #pixelpushing 2012-05-05 15:23:48 +02:00
Thomas Tanghus
eda42cece9 Contacts: Don't try to render invalid properties. 2012-05-05 13:49:47 +02:00
Thomas Tanghus
f9aadfff7a Contacts: Set min-width on note to make it render correctly. 2012-05-05 13:49:47 +02:00
Frank Karlitschek
9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Thomas Tanghus
2c264f836c Contacts: Better checks for GD library. 2012-05-04 23:53:29 +02:00
Bart Visscher
d0b7b01737 Tasks: Some styling 2012-05-04 20:57:37 +02:00
Bart Visscher
19d2b94837 Tasks: More updates to public API 2012-05-04 20:20:37 +02:00
Thomas Tanghus
76b8d06284 Add missing file. 2012-05-04 20:17:15 +02:00
Bart Visscher
1fef13b0c0 Calendar: Use array_merge to join event arrays 2012-05-04 17:34:13 +02:00
Bart Visscher
eae21f3269 Tasks: Fix ajax calls in javascript 2012-05-04 17:27:10 +02:00
Bart Visscher
0006b432f5 Tasks: Update for movable apps 2012-05-04 17:20:24 +02:00
Bart Visscher
439467746a Tasks: Update to new public API 2012-05-04 17:19:25 +02:00
Bart Visscher
1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Thomas Tanghus
01da64caf7 Contacts: Changed the Add property button to not fixed and use plain button. 2012-05-04 16:36:45 +02:00