Commit Graph

39130 Commits

Author SHA1 Message Date
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing
Conflicts:
	files/css/files.css
	lib/base.php
2011-08-07 15:56:26 -04:00
Michael Gapczynski 5d521d7c7c Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions 2011-08-07 15:20:57 -04:00
Serge Martin 3e8ae8636c Add postgresql support
REVIEW: 102101
2011-08-07 21:06:53 +02:00
Serge Martin acf7916e71 user is a reserved word in postgresql 2011-08-07 19:02:41 +02:00
Frank Karlitschek a0b7b85c56 remove debug 2011-08-07 18:00:35 +02:00
Frank Karlitschek 58c2d29f8c report the right webserver user to simplify setup and debug 2011-08-07 17:58:56 +02:00
Frank Karlitschek b2702c4406 fix include path 2011-08-07 17:39:38 +02:00
Frank Karlitschek f5a030f4ae remove the ownCloud 3D support and add lot's of usefull 3rd party libraries instead. 2011-08-07 17:36:49 +02:00
Frank Karlitschek 51caa624bb first step to file encription 2011-08-07 17:32:48 +02:00
Serge Martin 7c254dd94d Exit after call to setup 2011-08-07 15:39:01 +02:00
Jakob Sack 8876ae0e98 Add two tables to db scheme file 2011-08-07 10:53:39 +02:00
Frank Karlitschek 60cb7c1c4d Merge branch 'master' of git.kde.org:owncloud 2011-08-06 23:31:57 +02:00
Frank Karlitschek 1dc3cb67fa more improved error reporting 2011-08-06 23:31:38 +02:00
Jakob Sack 5e2f7bfda9 Small details in contacts 2011-08-06 23:29:25 +02:00
Frank Karlitschek a689fa18df Merge branch 'master' of git.kde.org:owncloud 2011-08-06 23:19:40 +02:00
Robin Appelman 6d5402247c some documentation for the common javascript 2011-08-06 23:19:07 +02:00
Frank Karlitschek b513a60540 nicer error report and streamlined setup 2011-08-06 23:19:00 +02:00
Jakob Sack 63de1841a6 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-06 23:10:14 +02:00
Jakob Sack 77fccc9d00 TEMPORARY update path for carddav testers 2011-08-06 23:09:55 +02:00
Jakob Sack 42a6549729 Database.xml 2011-08-06 23:09:38 +02:00
Robin Appelman be9c044b24 descriptions for OC:: variables 2011-08-06 23:04:39 +02:00
Jakob Sack 2f10598af6 New app: contacts 2011-08-06 22:32:06 +02:00
Jakob Sack d9ccbe96dd fix template.php ;-) 2011-08-06 17:00:06 +02:00
Jakob Sack 501b767e6e Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-06 11:38:49 +02:00
Jakob Sack 5f7c040ec0 Add principals, minor changes in base.php 2011-08-06 11:36:56 +02:00
Robin Appelman f039320a0b move openid settings to Personal 2011-08-06 10:08:26 +02:00
Robin Appelman c998bc1215 fix some issues with browsers not supporting html5 localStorage 2011-08-06 10:08:26 +02:00
Michael Gapczynski fbdd65bf7b Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 2011-08-05 11:20:58 -04:00
Michael Gapczynski 843f8aca7c Full support for making and deleting public links from share dropdown 2011-08-05 11:18:35 -04:00
Robin Appelman faf6c0e8e1 fix some forgotten quotes around strings 2011-08-05 11:19:46 +02:00
Jan-Christoph Borchardt 6d5cb13018 fixed relative time calculation 2011-08-05 08:19:51 +02:00
Jan-Christoph Borchardt 193b9c9386 styled undo file deletion 2011-08-05 07:37:08 +02:00
Robin Appelman 01cecc8388 redirect index.php to files/webdav.php for webdav (PROPFIND) requests 2011-08-04 20:06:33 +02:00
Robin Appelman 60a7a9d6f0 allow users to use myhost/owncloud/?myusername as openid identity 2011-08-04 18:49:29 +02:00
Jan-Christoph Borchardt 222b728723 Revert "widen upload and new folder so that upload button text does not overflow"
because it already is in master
This reverts commit 4d17fbd3aa.
2011-08-04 15:39:16 +02:00
Jan-Christoph Borchardt 12cc7c77ba widen upload and new folder so that upload button text does not overflow 2011-08-04 15:29:35 +02:00
Jan-Christoph Borchardt 4d17fbd3aa widen upload and new folder so that upload button text does not overflow 2011-08-04 15:28:23 +02:00
Robin Appelman 122c3a3cf8 dont show confusing 'X files scanned' message when we are not scanning files 2011-08-04 01:26:29 +02:00
Robin Appelman 93b342ee39 only load the music player outside the media app if the media app isnt already open in another tab 2011-08-04 01:19:21 +02:00
Robin Appelman e209511f86 provide undo button when deleting files from the web interface 2011-08-04 00:22:44 +02:00
Michael Gapczynski 8f01abf054 Share dropdown updates, making public links now works 2011-08-03 15:21:53 -04:00
Robin Appelman 4851a55c1d cache the collection for the media player again 2011-08-03 15:36:47 +02:00
Robin Appelman de0e16a6f3 fix a bug in the media player outside the media app 2011-08-03 14:26:37 +02:00
Robin Appelman 8e5184a8b9 correctly save the playlist if songs are removed and dont load the player outisde the media app if the playlist is empty 2011-08-03 14:23:35 +02:00
Jan-Christoph Borchardt a84b00cefc fixing old CSS and HTML, navigation before content 2011-08-03 05:19:17 +02:00
Jan-Christoph Borchardt d8c86a2ad6 cleaned up settings a bit 2011-08-03 05:09:42 +02:00
Jan-Christoph Borchardt 9b4d19a13f updated COPYING and README, added proper AUTHORS, add yourself and excuse me if I forgot you 2011-08-03 04:47:08 +02:00
Jan-Christoph Borchardt c79af7cc4f removed icon for public links navigation subentry 2011-08-03 04:44:17 +02:00
Robin Appelman fdb944e7a3 send the filename header for public links 2011-08-03 02:29:33 +02:00
Robin Appelman 6527048164 dont force a download for public links 2011-08-03 01:06:25 +02:00