mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,543 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

363 Commits

Author SHA1 Message Date
Jakob Sack 4b967a9414 Minor improvements 2011-08-08 23:14:47 +02:00
Robin Appelman d1d47eb5eb do proper styling for settings pages 2011-08-08 22:38:42 +02:00
Robin Appelman e6f6d3dabc dont use a different navigation page for settings stuff 2011-08-08 21:43:31 +02:00
Bartek Przybylski 8bd82b96f3 checking for apache server in setup 2011-08-08 21:41:20 +02:00
Michael Gapczynski 1aa89b7cbb Merge branch 'master' into sharing 
Conflicts:
	files/css/files.css
	lib/base.php
 2011-08-07 15:56:26 -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 51caa624bb first step to file encription 2011-08-07 17:32:48 +02:00
Frank Karlitschek 1dc3cb67fa more improved error reporting 2011-08-06 23:31:38 +02:00
Frank Karlitschek a689fa18df Merge branch 'master' of git.kde.org:owncloud 2011-08-06 23:19:40 +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 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 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 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
Robin Appelman a2062036d3 selecting a text file from the search results now activates the text viewer 2011-08-03 00:30:21 +02:00
Robin Appelman e50abdd355 limit the length of the mysql username during setup 2011-08-02 21:33:35 +02:00
Jakob Sack db90b2e44a prepare replacing global $vars with OC::$vars 2011-08-02 18:48:19 +02:00
Jakob Sack c50a83cd8d Introducing a semiautoload. Enables autoload for classes that are not in lib/ 2011-08-02 18:31:42 +02:00
Michael Gapczynski ddfc9fc001 Move registering shared storage out of base 2011-08-01 10:58:15 -04:00
Robin Appelman 2d19965750 some improvements to collection scanning 2011-08-01 00:07:46 +02:00
Robin Appelman 14f7daf53c add transitions to oc_db 2011-07-31 20:24:53 +02:00
Michael Gapczynski 17058c9467 Merge branch 'master' into sharing 2011-07-31 12:53:34 -04:00
Robin Appelman b93b066a42 fix search results having files from other users 2011-07-31 15:35:37 +02:00
Robin Appelman 5ef407d1c9 keyboard shortcuts for search results 2011-07-31 04:03:48 +02:00
Robin Appelman 2c8b4da840 make sure jquery and common javascript is loaded before the javascript of the apps 2011-07-31 02:24:46 +02:00
Robin Appelman 0bc16683e5 dont show music results twice 2011-07-31 02:20:34 +02:00
Michael Gapczynski 0d3ebbfefd Merge branch 'master' into sharing 2011-07-30 19:57:57 -04:00
Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes 
Conflicts:
	lib/base.php
 2011-07-30 19:40:19 -04:00
Robin Appelman 1564a40538 dont show the full path for the files in search results 2011-07-31 01:26:13 +02:00
Robin Appelman 0503c3499e configure users/groups before loading apps 2011-07-31 00:23:06 +02:00
Jakob Sack 0dab7f2e53 laod apps ways earlier! 2011-07-31 00:06:17 +02:00
Robin Appelman aafd36e2f3 provide json interface for search 2011-07-30 16:42:20 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack 2ff8d7a8bc One class per file! 2011-07-29 21:03:53 +02:00
Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload 
Conflicts:
	lib/base.php
	lib/filestorage.php
 2011-07-29 20:42:24 +02:00
Michael Gapczynski 5fd77084c4 Merge branch 'master' into sharing 
Conflicts:
	core/templates/layout.user.php
 2011-07-29 13:58:13 -04:00
Robin Appelman d12d08e2f3 some more changes for navigation subentries 2011-07-29 19:43:06 +02:00
Robin Appelman fe47d51598 some refactoring for subnavigation code 2011-07-29 19:12:55 +02:00
Michael Gapczynski fcc9f50641 Merge branch 'master' into sharing 
Conflicts:
	files/templates/index.php
 2011-07-29 10:23:15 -04:00
Robin Appelman 6d0c8ea7e4 use proper file icons for image and audio files 2011-07-29 01:37:08 +02:00
Jan-Christoph Borchardt f1616b0e62 implemented relative file size and coloring 2011-07-29 00:46:20 +02:00
Robin Appelman f1c2b5b304 set installed version in config file 2011-07-28 23:34:39 +02:00
Robin Appelman 20f5a9f085 bumb version number for upcomming beta 2011-07-28 23:34:39 +02:00
Robin Appelman 7d15a45e09 use oc_preferences to store ocs privatedata 2011-07-28 20:23:58 +02:00
Robin Appelman 0d408fe6f5 make use of the command line tools id3info and mp3info for scanning music if they are available 2011-07-28 20:10:58 +02:00
Robin Appelman 7505720350 fix log when no tablename prefix is used 2011-07-27 22:44:51 +02:00
Jakob Sack e69079f935 Further improvements 2011-07-27 20:04:42 +02:00
Jakob Sack 924100dd8c One class per File 2011-07-27 19:52:24 +02:00
Jakob Sack f5c0dbd947 Use autoload 2011-07-27 19:07:28 +02:00
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