Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -76/+78 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | |||||
| | * | | | Add linkToRoute functionality | Bart Visscher | 2012-09-12 | 1 | -0/+14 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 1 | -58/+64 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php | |||||
| | * \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 1 | -0/+11 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | Routing: And start using them from php | Bart Visscher | 2012-08-12 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-26 | 1 | -9/+4 | |
|\| | | | | | | ||||||
| * | | | | | | Fix mimetype detection with the 'file' utility | Victor Dubiniuk | 2012-10-26 | 1 | -9/+4 | |
| | | | | | | | ||||||
* | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-25 | 1 | -5/+5 | |
|\| | | | | | | ||||||
| * | | | | | | Checkstyle: NoSpaceAfterComma | Felix Moeller | 2012-10-23 | 1 | -5/+5 | |
| | | | | | | | ||||||
* | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-24 | 1 | -5/+5 | |
|\| | | | | | | ||||||
| * | | | | | | More Checkstyle cleanup | Felix Moeller | 2012-10-23 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for all LowerCaseConstant warnings | |||||
* | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-23 | 1 | -2/+2 | |
|\| | | | | | | ||||||
| * | | | | | | Correct a first issue Checkstyle is complaining about ... | Felix Moeller | 2012-10-22 | 1 | -2/+2 | |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | This is BracketsNotRequired | |||||
* | | | | | | merge master into filesystem | Robin Appelman | 2012-10-17 | 1 | -1/+12 | |
|\| | | | | | ||||||
| * | | | | | core.js and core.css don't need to be absolute | Bart Visscher | 2012-10-17 | 1 | -1/+12 | |
| | | | | | | ||||||
* | | | | | | merge master into filesystem | Robin Appelman | 2012-10-11 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | fixed offset calculation (bug #1961) | Björn Schießle | 2012-10-11 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | don't use depricated OC_Filesystem | Robin Appelman | 2012-10-10 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | fix mimetype detection using the 'file' command in some edge cases | Robin Appelman | 2012-09-30 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Do urlencoding in linkTo functions | Bart Visscher | 2012-09-28 | 1 | -1/+3 | |
| |_|_|/ |/| | | | ||||||
* | | | | fix some more phpdoc | Robin Appelman | 2012-09-23 | 1 | -73/+72 | |
| | | | | ||||||
* | | | | don't interpret strpos '0' as 'false' in while loop | Björn Schießle | 2012-09-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | add leading '?' to parameter list (fixes bug #1732) | Björn Schießle | 2012-09-17 | 1 | -2/+5 | |
| |_|/ |/| | | ||||||
* | | | adding space between) and { | Thomas Mueller | 2012-09-07 | 1 | -56/+56 | |
| | | | ||||||
* | | | Add args parameter to linkTo(Absolute) function, to append the args automaticly | Bart Visscher | 2012-09-03 | 1 | -3/+9 | |
| |/ |/| | ||||||
* | | Initial previewer for public links | Michael Gapczynski | 2012-08-27 | 1 | -0/+11 | |
|/ | ||||||
* | Move serverHost and serverProtocol functions to OC_Request | Bart Visscher | 2012-08-07 | 1 | -47/+1 | |
| | ||||||
* | Added function to make url absolute | Bart Visscher | 2012-08-07 | 1 | -2/+13 | |
| | ||||||
* | provide recursiveArraySearch as Helper function and make available through API | Arthur Schiwon | 2012-07-25 | 1 | -1/+27 | |
| | ||||||
* | some indention fixes | Robin Appelman | 2012-07-24 | 1 | -2/+0 | |
| | ||||||
* | use file extension for determining mimetypes on default | Robin Appelman | 2012-07-22 | 1 | -16/+13 | |
| | | | | | 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 | |||||
* | fix unused variables | Robin Appelman | 2012-07-20 | 1 | -3/+3 | |
| | ||||||
* | provide multibyte aware helper functions mb_str_replace, mb_substr_replace ↵ | Arthur Schiwon | 2012-07-02 | 1 | -5/+69 | |
| | | | | and mb_array_change_key_case for handling with UTF 8 | |||||
* | fixed linkTo() | Florian Hülsmann | 2012-06-30 | 1 | -1/+1 | |
| | ||||||
* | Remove redundant code from OC_Helper::linkTo | Bart Visscher | 2012-06-28 | 1 | -6/+3 | |
| | ||||||
* | fix running tests from cli | Robin Appelman | 2012-06-27 | 1 | -0/+3 | |
| | ||||||
* | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-21 | 1 | -0/+6 | |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php | |||||
| * | fixes oc-668 | Thomas Mueller | 2012-06-18 | 1 | -0/+6 | |
| | | ||||||
* | | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-14 | 1 | -37/+37 | |
|\| | | | | | | | | | | | | | | | Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php | |||||
| * | White-space fix. | Thomas Tanghus | 2012-06-14 | 1 | -36/+36 | |
| | | ||||||
| * | Don't add slash if it's there already. | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 | |
| | | ||||||
* | | Correct remote and public, and last occurence of OC:: | Brice Maron | 2012-06-06 | 1 | -1/+1 | |
| | | ||||||
* | | Unit path and webpath, correct some more | Brice Maron | 2012-06-06 | 1 | -2/+2 | |
| | | ||||||
* | | First almost working version | Brice Maron | 2012-06-06 | 1 | -2/+2 | |
|/ | ||||||
* | more reliable host detection for reverse proxy servers | Frank Karlitschek | 2012-06-05 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'unstable' | Bart Visscher | 2012-06-04 | 1 | -2/+2 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/tests/config.php apps/files_versions/ajax/getVersions.php apps/files_versions/appinfo/app.php apps/files_versions/history.php apps/files_versions/js/versions.js apps/files_versions/templates/history.php apps/files_versions/versions.php lib/base.php | |||||
| * | Combine and minimize core and default app css files | Bart Visscher | 2012-05-16 | 1 | -2/+2 | |
| | | ||||||
* | | added a serverProtocol function that correctly returns the used protocol ↵ | Frank Karlitschek | 2012-06-01 | 1 | -3/+22 | |
| | | | | | | | | even if the ssl connection is terminated at a reverse_proxy or at a load balancer | |||||
* | | don´t hardcode /tmp | Frank Karlitschek | 2012-05-30 | 1 | -1/+1 | |
| | | ||||||
* | | update copyright | Frank Karlitschek | 2012-05-26 | 1 | -1/+1 | |
|/ |