Commit Graph

132 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Frank Karlitschek 5b2aeebaf0 Merge pull request #280 from butonic/feature_bmp_support
add bmp support
2012-11-19 00:53:46 -08:00
Valerio Ponte de7e419610 Fixed style according to owncloud styleguide 2012-11-14 20:10:20 +01:00
Valerio Ponte 8e190a5a97 Moved X-Sendfile headers into OC_Files::get
now should work with temp files too
2012-11-14 20:10:20 +01:00
Jörn Friedrich Dreyer 0ce5e9257e add php-doc for ellipsis 2012-11-12 14:04:23 +01:00
Jörn Friedrich Dreyer 28671d92c0 move code to better places 2012-11-12 13:56:29 +01:00
Tom Needham 0833be9d4e Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
Check files when copying recursivley

Remove obsolete method

Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
Felix Moeller f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Felix Moeller dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Bart Visscher 0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Victor Dubiniuk d428d72dab Fix mimetype detection with the 'file' utility 2012-10-26 21:02:04 +03:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Felix Moeller 2d61f03452 More Checkstyle cleanup
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Felix Moeller 03581ef463 Correct a first issue Checkstyle is complaining about ...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
Bart Visscher 6081bfa2bc Merge branch 'master' into routing
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
2012-10-17 16:38:11 +02:00
Bart Visscher 04824162d9 core.js and core.css don't need to be absolute 2012-10-17 10:52:16 +02:00
Björn Schießle 4d451f649d fixed offset calculation (bug #1961) 2012-10-11 12:42:57 +02:00
Robin Appelman 258782584e fix mimetype detection using the 'file' command in some edge cases 2012-09-30 03:58:58 +02:00
Bart Visscher 22d22d19c0 Do urlencoding in linkTo functions 2012-09-28 22:27:52 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
2012-09-28 15:38:49 +02:00
Robin Appelman 4131b205d4 fix some more phpdoc 2012-09-23 02:40:03 +02:00
Björn Schießle 2570ea7114 don't interpret strpos '0' as 'false' in while loop 2012-09-18 16:14:04 +02:00
Björn Schießle 1207ae1f99 add leading '?' to parameter list (fixes bug #1732) 2012-09-17 17:02:17 +02:00
Bart Visscher 3efe1d3b24 Add linkToRoute functionality 2012-09-12 18:00:33 +02:00
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher 1a46192433 Add args parameter to linkTo(Absolute) function, to append the args automaticly 2012-09-03 21:51:32 +02:00
Bart Visscher b483f2aab8 Merge branch 'master' into routing
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
2012-08-30 21:49:28 +02:00
Michael Gapczynski 0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00
Bart Visscher 16dacba490 Routing: And start using them from php 2012-08-12 16:53:00 +02:00
Bart Visscher 99ce7ba1df Move serverHost and serverProtocol functions to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher c4f1a1de5b Added function to make url absolute 2012-08-07 20:43:00 +02:00
Arthur Schiwon 6b320a2604 provide recursiveArraySearch as Helper function and make available through API 2012-07-25 12:56:08 +02:00
Robin Appelman 856d9c0b54 some indention fixes 2012-07-24 00:39:59 +02:00
Robin Appelman 2a73678fef use file extension for determining mimetypes on default
should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
2012-07-22 01:53:20 +02:00
Robin Appelman 48306a3c4f fix unused variables 2012-07-20 17:58:05 +02:00
Arthur Schiwon 52822652bc provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8 2012-07-02 20:31:19 +02:00
Florian Hülsmann 4ed55315e7 fixed linkTo() 2012-06-30 16:53:41 +02:00
Bart Visscher 19bb4e83c9 Remove redundant code from OC_Helper::linkTo 2012-06-28 22:11:04 +02:00
Robin Appelman 12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
Thomas Mueller c1df0539a0 fixes oc-668 2012-06-18 23:33:02 +02:00
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Thomas Tanghus 8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02:00
Thomas Tanghus a34db3fbe0 Don't add slash if it's there already. 2012-06-14 13:23:12 +02:00
Brice Maron 6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Brice Maron b6c5ca126b First almost working version 2012-06-06 20:23:17 +00:00
Frank Karlitschek e3031ae28b more reliable host detection for reverse proxy servers 2012-06-05 12:52:23 +02:00