958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
c482512e23
LDAP: fix wrong hook name
2013-08-22 00:00:33 +02:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
83afb46205
Use __DIR__ instead of dirname(__FILE__).
...
This is possible because we require PHP 5.3 or higher.
2013-08-21 11:01:24 +02:00
85ac9572ce
Also remove other unnecessary realpath() calls.
2013-08-21 10:53:18 +02:00
9753e44ac2
Do not use realpath() on includes.
...
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.
'include' works just fine with symlinks, "./" and "../".
2013-08-21 10:52:22 +02:00
38f9df4293
introducing OCP\AppFramework\App
2013-08-21 01:02:15 +02:00
911bd3c16f
moving response classes over to OCP
2013-08-21 01:00:26 +02:00
e39083c36f
typo
2013-08-21 00:58:33 +02:00
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
aa979f5dff
cleanup of tests
2013-08-21 00:44:39 +02:00
33db8a3089
kill superfluent classloader from tests - this approach might be of interest within the apps
2013-08-21 00:41:20 +02:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
395deacc67
reducing controller annotations to:
...
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
2013-08-20 21:21:21 +02:00
25ebe495b8
controller reuses IRequest methods
2013-08-20 21:05:55 +02:00
f115b94927
Introducing IRequest
2013-08-20 17:53:58 +02:00
6e1946ab00
Introducing IContainer into public api
2013-08-20 17:22:33 +02:00
93194bb396
Introducing IContainer into public api
2013-08-20 17:21:14 +02:00
cdada78aa4
typos & unused var fixed
2013-08-20 17:20:36 +02:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
0fa8f38076
fixing broken test
2013-08-20 16:51:12 +02:00
0fa2e1b3d9
there is no HttpMiddleware
2013-08-20 12:48:45 +02:00
72e1a8d83b
fixing require to Pimple
2013-08-20 12:47:23 +02:00
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
9e5b721a0d
fix minor style issue in the app navigation
2013-08-19 15:42:51 +02:00
95e1b62940
Merge pull request #4510 from owncloud/f_e_webdav_urlencoding
...
Fix files_external webdav up and download when path contains ' '
2013-08-19 05:13:20 -07:00
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
89c928c3be
replace ' ' with '%20' in urls for curl
2013-08-19 11:09:55 +02:00
a1d5aba5fd
Merge pull request #4509 from owncloud/add-odf-templates-master
...
adding file templates for ods, odt and odp
2013-08-19 01:54:54 -07:00
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
6c518797ef
fixing require path
2013-08-18 19:14:14 +02:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
c620c5840a
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
...
move upload progress bar near upload button, more contextual
2013-08-18 09:30:47 -07:00
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +02:00
141d2f67aa
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
...
fixing error page layout
2013-08-18 06:46:48 -07:00
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
Arthur Schiwon
kondou
Georg Ehrke
Jenkins for ownCloud
Andreas Fischer
Morris Jobke
icewind1991
Robin Appelman
Jörn Friedrich Dreyer
Björn Schießle
Thomas Tanghus