Commit graph

4035 commits

Author SHA1 Message Date
Frank Karlitschek
43978abd80 increase to 4 beta 2012-05-07 22:58:22 +02:00
Frank Karlitschek
10d291d6b3 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-07 22:56:34 +02:00
Frank Karlitschek
40b823bc8b some more docu fixes 2012-05-07 22:55:44 +02:00
Bart Visscher
4dbc2093c6 Create a function for linking to remote.php 2012-05-07 21:47:14 +02:00
Georg Ehrke
9b5e0bebef fix path for ampache in settings 2012-05-07 20:47:32 +02:00
Georg Ehrke
5b7cefb1e5 make ampache work with remote.php 2012-05-07 20:26:09 +02:00
Arthur Schiwon
5a1ea62437 LDAP: Fall back to Base DN if user/group base settings are blanked 2012-05-07 18:38:02 +02:00
Michael Gapczynski
bf8b3b0696 Forgot to set token variable 2012-05-07 12:36:29 -04:00
Michael Gapczynski
52d113b9e1 Prevent extra '/' from being added to url if app is not defined 2012-05-07 12:35:02 -04:00
Brice Maron
da4688d804 Reorder code to avoid race condition in user creation 2012-05-07 16:08:35 +00:00
Arthur Schiwon
e9c7ecf22d applying coding guideline 2012-05-07 17:35:23 +02:00
Arthur Schiwon
0ff5ab65be applying coding guideline 2012-05-07 17:35:23 +02:00
Simon Birnbach
df6b15445d Fix bug on browsers like rekonq which stopped execution of javascript 2012-05-07 17:35:23 +02:00
Michael Gapczynski
e0a5f976e7 Fix bug oc-542, encode urls for private links 2012-05-07 11:30:36 -04:00
Michael Gapczynski
71423ec566 Fix bug oc-402, check if token is set for a private link 2012-05-07 10:47:55 -04:00
Michael Gapczynski
b9033d3b78 Only load sharing statuses if in files app 2012-05-07 10:47:55 -04:00
Georg Ehrke
f28d71bb9c fix gallery sharing 2012-05-07 16:46:35 +02:00
Georg Ehrke
ef073a148f make calendar compatible with public.php 2012-05-07 15:48:41 +02:00
Georg Ehrke
936c8ba1cc improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Georg Ehrke
5904d5cf50 Merge branch 'remote.php' 2012-05-07 15:07:16 +02:00
Georg Ehrke
d032345191 fix validation of getfile parameter - i hate this bloody merge conflicts 2012-05-07 13:23:55 +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
e33b12a375 fix path of webdav 2012-05-07 12:07:39 +02:00
Georg Ehrke
ef10603c26 fix pathes in calendar and contacts 2012-05-07 12:02:20 +02:00
Georg Ehrke
9bdd00c0f2 update htaccess file and remove remote folder 2012-05-07 11:54:42 +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
Georg Ehrke
5a264040d4 fix remote.php 2012-05-07 11:24:00 +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
cde60dba0f Fix typo. 2012-05-07 04:46:09 +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
aa0c3ddcfe Fix updateFolder() in OC_FileCache 2012-05-06 20:11:10 -04:00
Michael Gapczynski
41179a1456 Fix feedback for sharing errors 2012-05-06 19:06:24 -04:00
Michael Gapczynski
e0db22cc07 Provide feedback when user creation fails 2012-05-06 18:04:48 -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
d2b0de614e fix an XSS bug 2012-05-06 23:06:38 +02:00
Frank Karlitschek
1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Frank Karlitschek
5d55c709dd some more documentation cleanups. much more is needed.
And greeting from the Atlanta airport. ;-)
2012-05-06 22:02:16 +02:00
Frank Karlitschek
2edf59c026 first part of documentation update. lot´s more to come 2012-05-06 21:46:39 +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
Daniel
35177e00c0 Merge commit 'refs/merge-requests/109' of git://gitorious.org/owncloud/owncloud into merge-requests/109 2012-05-06 16:13:13 +02:00