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
18ce53f426
Merge commit 'refs/merge-requests/121' of git://gitorious.org/owncloud/owncloud
2012-06-16 00:15:02 +02:00
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
014895aeab
Check for missing path_info, also use OC_Response for 404 error
2012-06-09 14:39:41 +02:00
e8447e0bda
Rework to fit with minizer
2012-06-06 21:11:15 +00:00
6a812644e4
Correct remote and public, and last occurence of OC::
2012-06-06 20:24:15 +00:00
4a5973662c
Merge branch 'unstable'
...
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
2012-06-04 23:02:05 +02:00
c704e8077f
remote.php :: use non apache-only env vars
...
- fixes following error when using nginx + php-fpm
[error] *6568 FastCGI sent in stderr: "PHP message:
PHP Warning: strpos(): Offset not contained in string in
/some-path/owncloud/remote.php on line 10"
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2012-05-25 21:08:04 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
3ce6eca40a
fix fail in previous commit
2012-05-13 21:46:34 +02:00
3327aabe4d
fix remote.php for servers which doesn't support PATH_INFO
2012-05-13 21:46:34 +02:00
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
5a264040d4
fix remote.php
2012-05-07 11:24:00 +02:00
f69f764e8b
Working remote.php with webdav and caldav
2012-05-06 00:12:51 +02:00
c996600786
push changes
2012-05-05 22:54:14 +02:00
Brice Maron
Bart Visscher
BlackEagle
Robin Appelman
Georg Ehrke