Commit graph

256 commits

Author SHA1 Message Date
Michael Gapczynski
ff3140052a Merge branch 'master' into sharing 2011-07-26 21:29:44 -04:00
Robin Appelman
98cd83fabd bumb jquery and jquery-ui versions 2011-07-25 23:16:05 +02:00
Robin Appelman
edec37b402 add OC_APP::getCurrentApp() to get the id of the active app 2011-07-25 20:25:53 +02:00
Robin Appelman
9a989a284a fix sabredav for sqlite2 2011-07-25 03:14:22 +02:00
Michael Gapczynski
415ae8e40a Merge branch 'master' into sharing 2011-07-24 16:08:39 -04:00
Jakob Sack
3097e4f48a Merge branch 'sabredav' 2011-07-22 23:18:08 +02:00
Jakob Sack
ccc94819e2 Merge branch 'sabredav' of git://anongit.kde.org/owncloud into sabredav 2011-07-22 23:16:43 +02:00
Jakob Sack
5416c0e6f8 Remove HTTP_Webdav 2011-07-22 23:16:14 +02:00
Robin Appelman
18a36be28c fix problem with removing locks 2011-07-22 23:06:53 +02:00
Jakob Sack
3b92ec12c2 Properties work fine now 2011-07-22 22:30:45 +02:00
Jakob Sack
5851da47f1 properties nearly work 2011-07-22 16:21:29 +02:00
Jakob Sack
7c9f356abe Support for locks, minor changes 2011-07-22 14:38:42 +02:00
Michael Gapczynski
0387cc5f1f Merge branch 'master' into sharing 2011-07-21 19:18:26 -04:00
Robin Appelman
f441059b01 add getLocalFile to local storage provider 2011-07-22 06:29:45 +02:00
Robin Appelman
8eefd42a7d only remove old sqlite database if it exists 2011-07-21 00:52:48 +02:00
Michael Gapczynski
6af4c465b8 Change all occurences of ['user_id'] to OC_USER::getUser() 2011-07-20 16:52:01 -04:00
Michael Gapczynski
1cfa911ce3 Update database.xml to current database fields, remove hard coded MTGap when mounting shared storage provider 2011-07-20 14:42:48 -04:00
Michael Gapczynski
abf6ba621a Merge branch 'master' into sharing 2011-07-20 14:30:19 -04:00
Jakob Sack
86cd8063b4 Use SabreDAV authentication Code! 2011-07-20 16:36:36 +02:00
Jakob Sack
bf1ca75710 Integration of SabreDAV 2011-07-20 15:53:34 +02:00
Bartek Przybylski
c5776fdae4 remember login added 2011-07-20 15:04:14 +02:00
Robin Appelman
6935f036a5 move list of mimetypes by extention to a seperate file. 2011-07-17 17:41:46 +02:00
Michael Gapczynski
f09f2d3290 Fix typo in setup, thanks for pointing it out ab0oo 2011-07-13 17:19:13 -04:00
Michael Gapczynski
ecaf66ee97 Add missing argument for fromTmpFile() inside of rename() 2011-07-13 13:47:45 -04:00
Michael Gapczynski
5896e48755 Add missing argument for fromTmpFile() inside of rename() 2011-07-13 13:30:22 -04:00
Michael Gapczynski
a79f2535f8 Merge branch 'master' into sharing 2011-07-12 20:51:07 -04:00
Michael Gapczynski
a861666500 Add missing parameter for fromTmpFile() inside of copy() 2011-07-12 20:50:04 -04:00
Michael Gapczynski
2c4fef91da Merge branch 'master' into sharing 2011-07-12 18:38:03 -04:00
Michael Gapczynski
f8eced1960 Fix post_create and post_write hooks in copy(), was referencing an undefined variable 2011-07-12 18:26:44 -04:00
Michael Gapczynski
6b303ee64b Fix bug in opendir() and remove getStorageMountPoint(), now using datadir argument instead 2011-07-12 13:10:29 -04:00
Michael Gapczynski
5e560e9bd9 Merge branch 'master' into sharing 2011-07-06 20:19:44 -04:00
Jan-Christoph Borchardt
e3fd72dc16 introducing simple file size, only MB as unit, details on hover 2011-07-07 01:27:16 +02:00
Michael Gapczynski
9deab8302f Fix bugs in getSource() and implement new target path standard 2011-07-05 11:56:02 -04:00
Michael Gapczynski
607f1a2738 Fix conflicts with master in lib/base.php 2011-07-04 16:45:19 -04:00
Michael Gapczynski
05389827fd Merge branch 'master' into sharing
Conflicts:
	.gitignore
	lib/base.php
2011-07-04 16:36:30 -04:00
Kunal Ghosh
f2845bbea8 Fix to make the Unlock mechanism of WebDAV work. Previously when using unlock in cadaver etc was used the lock entry corresponding to the file was not deleted in the sqlite database table oc_locks. The error was because the delete query in the Unlock function was not getting executed :) 2011-07-02 07:17:05 +05:30
Robin Appelman
f40a1cad8b not all http server add index.php to $_SERVER[SCRIPT_NAME], do it manually
this fixes incorect generated links in some cases
2011-06-26 00:59:31 +02:00
Robin Appelman
155f62bcf6 allow plugins/apps to add custom headers to all pages 2011-06-24 22:09:55 +02:00
Aamir Khan
2098cbd822 redirect_url to be respected in linkTo function 2011-06-25 01:14:28 +05:30
Robin Appelman
4d11e920be provide an option to add custom elements to the header of templates 2011-06-24 18:02:19 +02:00
Michael Gapczynski
467778d66f Merge branch 'master' into sharing 2011-06-23 17:54:49 -04:00
Kamil Domanski
2073d3b08e fix 404 2011-06-23 23:47:46 +02:00
Kamil Domanski
0bf67298d1 no indexing in generated htaccess 2011-06-23 23:41:53 +02:00
Robin Appelman
8b76590f5d fix creating users 2011-06-23 18:23:47 +02:00
Dominik Schmidt
3b2fcd356f Use new user backend API 2011-06-23 15:24:09 +02:00
Dominik Schmidt
96657f8b62 Detect backend features dynamically instead of trial-and-error usage
Move documented functions for reference into OC_USER_EXAMPLE class.
2011-06-23 14:45:28 +02:00
Michael Gapczynski
18e776fa2f Changed mount point to 'Share', fixed is_dir() 2011-06-22 11:40:09 -04:00
Robin Appelman
83958ebd4b add oc_user::getUser to get the user id of the loggedin user 2011-06-22 12:50:57 +02:00
Robin Appelman
36dbb8edab prefix the mysql user name to avoid collissions 2011-06-21 23:58:02 +02:00
Kamil Domanski
e047feb2ad install shipped apps also in "installed apps" page 2011-06-21 22:17:53 +02:00