581cd9bb9c
Support existing sessions within OCS API calls
2013-10-21 18:58:46 +02:00
2628601e79
adding oc-mtime handling to chunked upload
2013-10-21 15:00:28 +02:00
3cb666ad77
chunked files are assembled into a part file on the target storage followed by an atomic rename operation.
2013-10-21 13:21:39 +02:00
5978ddbec6
Try to create custom log file before falling back to default.
2013-10-20 23:58:07 +02:00
701009bd72
dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209
2013-10-20 20:55:27 +02:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
33c4747fdf
Use display name from magic cookie, fixes #4884
2013-10-18 13:36:33 +02:00
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
5c5621d84e
Merge pull request #5395 from owncloud/more_check_options
...
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
11cfb9dc48
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
...
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
b1f72edc57
Fixed spaces
2013-10-17 23:22:19 +02:00
d2d2c9a46d
fixes #5367
2013-10-17 20:20:13 +02:00
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
f9bbfad3e5
Fix sharing error message - id -> file name
...
fixe #2827
2013-10-17 16:45:11 +02:00
6a60a47d59
add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
2013-10-17 16:27:43 +02:00
c3c27b3e58
Merge pull request #5394 from owncloud/sabre-server-location
...
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
5ee74b656c
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 16:04:59 +02:00
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
e55d2359b1
removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
...
adding PHPDoc
2013-10-17 14:54:37 +02:00
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
9c8d1190c0
Merge pull request #5385 from owncloud/generate-sql-migration-master
...
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
d2b1a361cc
Merge pull request #5379 from owncloud/undefined-shipped
...
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
793ccfd1df
fix undefined "shipped"
2013-10-17 11:35:13 +02:00
b70d67d49a
Merge pull request #5237 from owncloud/coverage-on-windows-master
...
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
186c6a56d1
Merge pull request #4949 from owncloud/improve_unknown_preview_backend
...
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
d70a6c3f98
Merge pull request #4935 from owncloud/webdav-depth-fix-master
...
WebDAV depth infinity support - the dirty way
2013-10-17 01:37:38 -07:00
30f4d91d01
Public API documentation fixes
...
refs #4883
* http/response.php
* config.php
* response.php
* files.php
* idbconnection.php
* app.php
* user.php
* template.php
* share.php
* db.php
* icache.php & il10n.php
2013-10-17 00:49:15 +02:00
04783da829
Merge pull request #5276 from owncloud/fixing-5170-master
...
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
221a650815
Merge branch 'master' into activities-api
...
Conflicts:
lib/private/server.php
2013-10-16 21:15:25 +02:00
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
852a50aa89
remove test code
2013-10-16 15:38:56 +02:00
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
d8a7b1e537
Merge branch 'master' into fixing-5170-master
2013-10-16 14:48:55 +02:00
fa3a65aea7
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
...
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
52e31405f7
Added timeout value to WebDAV post setup check
...
Fixes #5357
2013-10-16 12:34:22 +02:00
7037f9c6f8
Added DAV client wrapper that support timeout values
...
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
2013-10-16 12:32:42 +02:00
ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
a201a66878
fix style
2013-10-14 10:57:00 +02:00
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
14617682c8
Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error
2013-10-12 09:15:59 +01:00
6f8dd54788
Include exception message in log entry when session fails to start
2013-10-12 09:15:08 +01:00
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
cf7ea4bec5
Handle ownCloud logging when data dir not created
2013-10-11 17:16:37 +01:00
cb110c0679
Log the session exception when ownCloud is not installed
2013-10-11 16:45:58 +01:00
e28f7f8a33
remove php and js previews
2013-10-11 11:43:26 +02:00
4336d42ab0
Merge pull request #5233 from owncloud/enc_filter_users
...
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
51e6565aab
only text/plain is now used to generate text previews
...
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
19ea4f79da
resize svg without loosing quality
2013-10-11 00:12:37 +02:00
26c0007a5f
Merge pull request #5263 from owncloud/fixing-5255-master
...
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
0641365a10
Merge pull request #4780 from AxelRb/master
...
On an auth failure the uid and the IP address should be logged to the st...
2013-10-10 07:21:36 -07:00
bc6e352ccd
the path need to be normalized before putting it into resolvePath()
...
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
9b0454380c
changed the argument to false for getValue , reformated else statement
2013-10-10 14:15:13 +02:00
1378af838c
merge master into hooks-view-same-start
2013-10-10 11:34:30 +02:00
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
6053007768
Merge pull request #5210 from owncloud/sharing_search_users_fix
...
find users which are in the same group
2013-10-10 01:50:51 -07:00
1a899ac4c3
Merge pull request #5232 from owncloud/fixing-webdav-touch-master
...
due to internal implementations touch will always be successful - $mtime...
2013-10-10 01:49:59 -07:00
7f8eeb0474
ensure the view's root is a subfolder of the the default root, not only starting the same
2013-10-09 20:46:43 +02:00
38c563dcdc
don't trigger the create hooks when if the file already exists for file_put_contents
2013-10-09 20:34:18 +02:00
8e97752bf7
adding OC6 public API for activities
2013-10-09 18:06:21 +02:00
926b3c9b7b
Merge branch 'master' into activities-api
2013-10-09 17:53:57 +02:00
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +02:00
27738fc4f5
due to internal implementations touch will always be successful - $mtime will be stored in the cache
...
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
b4df4cc61d
Merge pull request #5219 from owncloud/catch_wrong_timezone
...
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
c1e5725db9
changed default time format to ISO8601
2013-10-09 10:40:20 +02:00
fe64f7b900
Merge pull request #5032 from owncloud/fixing-5006-master
...
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
* owncloud/fixing-5006-master:
Use strict comparison === instead of ==.
Adjust return value tests for checkPassword() to what OC_User_Example says.
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
Use parent:: in Test_User_Database::getUser().
Test_User_Backend::getUser() does not return an array, it returns a string.
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
7bd5352509
php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
2013-10-08 23:14:08 +02:00
51b581a84d
php 5.3 compatibility for \OC\Files\Storage
2013-10-08 23:00:41 +02:00
24e99016a9
Merge pull request #5188 from owncloud/master-delete-user
...
User::delete should return bool
2013-10-08 13:28:19 -07:00
6f3c49dabb
fixing php 5.3 compatibility
...
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
2013-10-08 21:52:54 +02:00
3cf4c46c43
catch unknown timezone and fall-back to UTC
2013-10-08 20:42:35 +02:00
75588fc0b6
Use strict comparison === instead of ==.
2013-10-08 20:03:16 +02:00
6eab36a89b
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
...
The user id has to be returned.
2013-10-08 19:57:37 +02:00
76bdd6bc81
Merge pull request #5173 from owncloud/set_timezone_for_log
...
let admin specify timezone for log file entries
2013-10-08 09:27:13 -07:00
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
92d9263e24
Merge pull request #5146 from guruz/cache_enabled_apps_list
...
OC_App: Cache list of enabled apps
2013-10-08 07:17:36 -07:00
3f27fefdbe
fixing status code and formatting
2013-10-08 15:40:42 +02:00
e7e53363ac
Merge pull request #5194 from owncloud/fixing-5172-master
...
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
f49de34373
Merge pull request #5193 from owncloud/fix_5126_2
...
fix upload to /Shared
2013-10-08 06:15:43 -07:00
caa27824a9
catch specific file exceptions and convert them to proper http status code via webdav
2013-10-08 15:04:31 +02:00
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
6c45fab037
part file needs to have .part extension
2013-10-08 12:00:32 +02:00
c77f74e1de
adding check isDeletable() on $sourcePath
2013-10-08 11:43:44 +02:00
dd202d9ad3
updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
2013-10-08 11:27:08 +02:00
0293d8e04f
If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder
2013-10-08 11:26:49 +02:00
2123ef57d8
Merge pull request #5181 from owncloud/fixing-chunked-upload-master
...
Fixing broken chunked upload due to #4974
2013-10-07 13:20:43 -07:00
77f43c357c
User::delete should return bool
2013-10-07 22:30:15 +03:00
6a93994a01
Merge pull request #4796 from owncloud/config-no-catch
...
Remove the exception catch in OC_Config, this should be handled by a higher layer
2013-10-07 11:45:13 -07:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
61a534fb60
moving createFileChunked() to OC_Connector_Sabre_File
2013-10-07 17:49:21 +02:00
5e397d89c4
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/directory.php
2013-10-07 17:47:54 +02:00
f496609085
the path for reassembling was created the wrong way
2013-10-07 17:34:21 +02:00
6a411833b9
let admin specify timezone for log file entries
2013-10-07 15:34:48 +02:00
b48dffa9a3
Merge pull request #5072 from owncloud/apache-auth-master
...
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
730c80ff9c
adding additional exceptions for special cases where creating a file might not be allowed
2013-10-07 15:11:47 +02:00
2b3c351601
Merge pull request #5162 from owncloud/fixing-l10n-master-2
...
Fixing l10n master 2
2013-10-07 05:07:47 -07:00
be4aea2d1b
fix indentation
2013-10-07 13:21:20 +02:00
e078fc3eda
fix wrong variable name
2013-10-07 13:19:21 +02:00
3b5dc51be4
fix doc block of OC\Preview\Provider::getThumbnail()
2013-10-07 13:19:21 +02:00
8a35d79a39
check if svg of filetype icon exists
2013-10-07 13:19:21 +02:00
f81053072f
use readImage instead of readImageBlob
2013-10-07 13:19:21 +02:00
d410faf11c
fix new extension
2013-10-07 13:19:21 +02:00
4ac3ecace2
use svg to generate filetype icon if imagick available
2013-10-07 13:19:20 +02:00
30faaf92b9
Merge pull request #5142 from owncloud/fix_version_cache_expire
...
correctly expire cache if version file changed.
2013-10-07 03:48:29 -07:00
3f29e4ebea
a few styleguide fixes
2013-10-07 12:27:02 +02:00
47ed6a5135
Move backend finding into its own method.
2013-10-07 12:26:25 +02:00
1e47468c53
Merge pull request #4974 from owncloud/fixing-4011-master
...
error handling added in case file_put_contents is failing
2013-10-07 02:58:00 -07:00
131d82e41e
move call to print_unescaped() to template
2013-10-07 11:49:43 +02:00
c3286402a8
removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo()
2013-10-07 11:41:28 +02:00
39be4dca67
removing all link/url related calls from API class
2013-10-07 11:38:23 +02:00
3ea2dfa5f9
remove getTrans() from API class
2013-10-07 11:36:38 +02:00
aefea2a408
remove unused classes
2013-10-07 11:25:06 +02:00
4e0c4c8f34
move l10n factory into private
2013-10-07 10:00:23 +02:00
dbdf34402c
remove outdated translation files
2013-10-07 09:59:15 +02:00
d986495297
Merge pull request #5148 from owncloud/cache-gc-legacy
...
Fix loading legacy global filecache gc backgroundjobs
2013-10-06 16:25:38 -07:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
54e77e0e66
fixing typo
2013-10-07 00:40:37 +02:00
780280e53f
fixing errors regarding wrong function calls / missing parameters
2013-10-07 00:35:05 +02:00
f3c6546d5b
remove obsolete passesCSRFCheck()
2013-10-07 00:34:23 +02:00
e071bfc144
fixing SecurityMiddleware to use OC6 API
2013-10-07 00:33:54 +02:00
3829a746a1
moving file to the right location
2013-10-07 00:32:39 +02:00
fda37ea09c
PHPDoc added
2013-10-07 00:32:08 +02:00
8115c38670
Remove the exception catch, this should be handled by a higher layer
...
And is when using index.php as entry point
2013-10-07 00:09:25 +02:00
1f14ba6aed
move controller to OCP
2013-10-06 23:16:40 +02:00
381b76ebd0
Merge pull request #5144 from owncloud/public_middleware
...
Make abstract Middleware class public
2013-10-06 14:12:35 -07:00
98ef90ad04
Fix loading legacy global filecache gc backgroundjobs
2013-10-05 23:19:12 +02:00
e564a3a266
OC_App: Cache list of enabled apps
...
In my test here 1 SELECT instead of 5 (when doing a DAV request,
probably similar for other requests)
2013-10-05 19:18:18 +02:00
47b2007228
Remove misleading IMiddleware interface
2013-10-05 19:13:12 +02:00
0501a947bc
Merge pull request #5116 from owncloud/interfaces2
...
More Interfaces for the public api
2013-10-05 08:35:50 -07:00
c85621a897
Make abstract Middleware class public
...
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
72b30e3e45
correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login
2013-10-05 12:50:36 +02:00
a82211220c
Merge pull request #5125 from owncloud/fixing-5122-master
...
upload abortion detection only for PUT
2013-10-05 02:25:45 -07:00
4bce2f8b85
Merge pull request #5123 from owncloud/cache_mimetypes
...
Load all mimetypes in one go
2013-10-05 02:24:38 -07:00
8da1aac1d0
Check result only once
2013-10-04 23:24:38 +03:00
414b2eb4b6
upload abortion detection only for PUT
...
e.g. LOCK would break with this approach
2013-10-04 20:20:33 +02:00
21cbef0d2c
passesCSRFCheck added to OCP\IRequest
2013-10-04 18:13:04 +02:00
61a9098b7d
Add Helper and URLGenerator interfaces to server container
2013-10-04 18:11:02 +02:00
ce9436c051
OC_Defaults is only used in error reporting
2013-10-04 18:11:02 +02:00
9f777fba98
Add L10N interface to server container
2013-10-04 18:11:02 +02:00
bae121b16d
Merge pull request #5068 from owncloud/improved_request
...
Improved request
2013-10-04 09:05:20 -07:00
ef65037211
Make mimetypes static. Jenkis will be happy
2013-10-04 18:09:42 +03:00
65750cb244
Load all mimetypes in one go
2013-10-04 16:17:19 +03:00
48a4c67d48
Merge pull request #5087 from owncloud/templatefunction-relativedate
...
Added dateOnly argument to relative_modified_date
2013-10-04 05:53:13 -07:00
f3594904c2
Removed $fromTime argument from public template API
2013-10-04 14:45:12 +02:00
aebc330f26
Merge branch 'master' into fixing-4011-master
2013-10-04 14:06:42 +02:00
800bf0769f
Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag
...
DAV: Use fileinfo_cache for ETag
2013-10-04 04:27:28 -07:00
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
47666796a7
ups. remove debug
2013-10-04 09:42:38 +02:00
e49ee47e7b
use Filesystem::isIgnoredDir
2013-10-04 09:28:46 +02:00
f0a98cc923
fix typo
2013-10-04 09:25:54 +02:00
6d95436695
add public static
2013-10-04 09:24:07 +02:00
e40afbebc6
make it possible to prepopulate a new user gome with a skeleton
2013-10-03 23:22:11 +02:00
7f7718888d
DAV: Use fileinfo_cache for ETag
2013-10-03 17:09:08 +02:00
006799616d
Fixed missing default values
...
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
2013-10-03 14:21:41 +02:00
b0bb64c3ee
Added unit tests for relative_modified_date, changed method signature
...
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.
Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
aedc427ffd
Fix fix of POST :P
2013-10-03 03:56:37 +02:00
8a018d7a59
Fix POST decoding
2013-10-03 01:43:33 +02:00
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
965ce5719f
Modified PUT behaviour
...
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
ed14541aea
Removed stray debug log write
2013-10-02 16:44:38 +02:00
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
aa34438d06
Also replace ApacheBackend with Authentication\IApacheBackend in user.
2013-10-02 15:11:49 +02:00
621ab1c7ee
fixing various PHPDoc comments
2013-10-02 15:04:42 +02:00
4d4eda0f06
fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend
2013-10-02 15:03:52 +02:00
8c77cd1901
remove obsolete function login()
2013-10-02 14:49:14 +02:00
78c60c25c8
only perform files upgrade in case there are actually entries in the old fscache table
2013-10-02 13:00:05 +02:00
1adadf36fc
Merge pull request #5071 from owncloud/fix-autoloader-master
...
Fix autoloader regression
2013-10-02 03:10:10 -07:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
0d7c36c9f1
adding PHPDoc comment
2013-10-02 01:13:02 +02:00
4cecede13d
code cleanup - remove special case for webdav in handleApacheAuth()
2013-10-02 00:55:35 +02:00
7e9e23f210
Merge branch 'master' into apache-auth-master
2013-10-02 00:21:11 +02:00
5bb4330ea4
Fix autoloader regression
2013-10-02 00:58:51 +03:00
9eab8b39df
Merge branch 'master' into fixing-4620-master
2013-10-01 22:57:46 +02:00
0537960dcc
adding getCurrentUserId() to ApacheBackend
2013-10-01 22:56:47 +02:00
a2cabd4c2a
Remove getContent() from IRequest
2013-10-01 20:15:04 +02:00
0f13ffb773
Remove JSON request parsing from Server
2013-10-01 20:15:04 +02:00
973bcccd7c
Implement PUT an PATCH support
2013-10-01 20:13:13 +02:00
36d1156cf8
Add interface docs to IRequest.
2013-10-01 20:13:13 +02:00
cd2e1d0cfe
Add patch method to OC_Route
2013-10-01 20:13:13 +02:00
bdad7697ac
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
8603f956ab
Get urlParams registered before Request is instantiated
2013-10-01 19:03:34 +02:00
e2fe71b6e7
Merge branch 'master' into lib-private-master-2
2013-10-01 16:11:59 +02:00
d8ada370d7
Squashed commit of the following:
...
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.
commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
2013-10-01 14:29:01 +02:00
02d6976263
Merge branch 'master' into lib-private-master-2
2013-09-30 21:29:58 +02:00
7c659eb291
use public api for session access from server container
2013-09-30 20:28:00 +02:00
bed27b603d
Merge branch 'master' into channels
...
Conflicts:
lib/util.php
2013-09-30 20:21:51 +02:00
2cf26ee0b1
put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
...
Conflicts:
lib/ocsclient.php
lib/util.php
2013-09-30 20:19:26 +02:00
69dd6af574
use ===
...
Shoudn't make a difference in this case but just in case
Conflicts:
lib/ocsclient.php
2013-09-30 20:15:16 +02:00
b948c1a1b6
prepare the updater for the new update channels
2013-09-30 20:14:18 +02:00
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
8e0060405d
reorganize file in lib
2013-09-30 16:39:03 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
d4fed61871
Merge pull request #5012 from owncloud/check_keyfiles_exists
...
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-30 06:55:56 -07:00
c2b6775efc
adding :
2013-09-30 13:27:46 +02:00
5e0cc6b5a6
adding copyright and PHPDocs
2013-09-30 13:12:51 +02:00
ecfde5faa1
Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity
...
The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released.
This will and has to follow!
2013-09-30 13:12:51 +02:00
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
a2301e8b69
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:45:52 +02:00
c62dc4fa80
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:36:08 +02:00
92c02e6797
remove commented code
2013-09-30 10:58:03 +02:00
e3dee63339
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
2013-09-30 10:46:50 +02:00
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +02:00
fe352664a2
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 10:06:36 +02:00
029abc9c43
mail is already themable via the template, no need to provide additional string in OC_Defaults
2013-09-30 10:03:12 +02:00
aaba0d83b5
fixing PHPDoc & typo
2013-09-30 10:03:07 +02:00
952433eae6
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
2013-09-30 09:21:37 +02:00
5899485ca1
Merge pull request #4969 from owncloud/fixing-4043-master
...
adding privilege check on move and rename operations
2013-09-30 00:20:34 -07:00
b6fc143074
cURL does not honour default_socket_timeout
...
SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.
One has to use
curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.
2013-09-30 07:56:54 +02:00
9ba0edcadb
Merge pull request #4966 from owncloud/text_preview_blacklist
...
add blacklist to txt preview backend
* owncloud/text_preview_blacklist:
rename variable in testIsTransparent
rename testTxtBlacklist to txtBlacklist
move fileView object initialization to testIsTransparent
use dataProvider for txt blacklist test
add test for txt blacklist
add test data for cal and contact preview
add blacklist to txt preview backend
2013-09-29 23:20:34 +02:00
a79294771b
Merge pull request #4960 from owncloud/fixing-mirall-1014-master
...
handle error situation of rename proper
2013-09-29 12:49:10 -07:00
48b5c1d5f9
initial implementation of activity manager
2013-09-29 20:31:12 +02:00
2e1e283592
Merge branch 'appframework-master' into activities-api
...
Conflicts:
lib/public/iservercontainer.php
2013-09-29 20:10:07 +02:00
adcb738e47
initialize $middleWares
2013-09-28 20:40:25 +02:00
57f37c876b
delay middleware registrations
2013-09-27 17:15:26 +02:00
adff34cb8a
fixing error in initialization of TagManager
2013-09-27 17:08:48 +02:00
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
03d5ea6cec
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-27 13:34:48 +02:00
f47ff13abf
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
...
prelogin apps have to be loaded within setupBackend() otherwise required...
2013-09-27 02:34:59 -07:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
9bb244cc59
check every enabled app if the remember login feature needs to be disabled
2013-09-26 19:34:28 +02:00
e515509a81
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
2013-09-26 13:34:47 +02:00
a86c10984a
catching NotPermittedException and throw it to the dav client as 403
2013-09-26 11:50:46 +02:00
b11d8799c1
adding unit tests for ObjectTree::move()
2013-09-26 10:50:15 +02:00
469b309b21
Merge pull request #4892 from owncloud/vcategories_public
...
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
0c44cdd4ea
remove unneccessary code
2013-09-25 17:28:45 +02:00
5e27ac4b1a
$path already contains the full path to the file
2013-09-25 17:17:29 +02:00
09b64535a9
fixing copyright and add class documentation
2013-09-25 17:05:14 +02:00
1c976a7c9b
manager checkPassword now returns User object, adjust internal user class accordingly.
2013-09-25 15:03:22 +02:00
68bfcfbf77
Merge pull request #4968 from owncloud/user_checkpwd
...
User: move checkPassword from User to Manager to not break API
2013-09-25 05:28:42 -07:00
acd3c11e47
use OC_DB::executeAudited
2013-09-25 12:18:29 +02:00
5a9e473a79
use OC_DB::executeAudited
2013-09-25 12:15:46 +02:00
3cd0caa643
set default value for expire parameter
2013-09-25 12:15:30 +02:00
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
30286c06ab
stripos return value check
2013-09-25 11:05:59 +02:00
b168d5aa3b
class API decommissioning part 1
2013-09-25 11:05:24 +02:00
b2ef978d10
AppFramework:
...
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
2013-09-25 10:30:48 +02:00
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
ca47fc5f18
fix PHPDoc
2013-09-24 19:37:24 +02:00
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
0637dad0b3
some small fixes
2013-09-24 18:52:20 +02:00
c486fc7608
introduce OC_Util::rememberLoginAllowed()
2013-09-24 18:01:34 +02:00
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
14a160e176
Adjust Tests and satisfy them
2013-09-24 17:10:01 +02:00
84a0e6930b
creating non static getETagPropertyForPath()
...
adding public $fileView to Node to allow unit testing
2013-09-24 15:35:21 +02:00
4e7f82ef04
unify duplicate code
2013-09-24 15:14:42 +02:00
cf9dbc6e34
adding error handling on file_put_contents within the web dav implementation
2013-09-24 14:25:56 +02:00
63324e2347
Fix doc
2013-09-24 14:12:44 +02:00
0a7ee7c3f7
Fix return value from User object to User ID
2013-09-24 14:11:47 +02:00
e9eb34f187
duplicate code :sigh: - will fix this in a second pr
2013-09-24 13:54:18 +02:00
6c5466a540
adding file_exists check just to be on the save side
2013-09-24 13:53:32 +02:00
fe88a62d6e
=== not ==
2013-09-24 13:51:33 +02:00
d101ff42f1
User: move checkPassword from User to Manager to not break API
2013-09-24 13:46:30 +02:00
ee1f627155
adding privilege check on move and rename operations
2013-09-24 13:26:12 +02:00
b693b5085c
don't remember login if the encrypion app is enabled because the user
...
needs to log-in again in order to decrypt his private key with his password
2013-09-24 13:08:55 +02:00
31d2048eb8
add blacklist to txt preview backend
2013-09-24 11:00:08 +02:00
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
2129974584
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
2013-09-24 00:59:23 +02:00
235517f111
clear permissions cache when scanning a file
2013-09-24 00:57:58 +02:00
8c469394e6
Remove duplicate method definitions
2013-09-24 00:12:23 +02:00
698394c994
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-24 00:09:21 +02:00
f2de5a34ef
Don't try to be clever
2013-09-24 00:04:57 +02:00
4d3e7fa78a
Add getUserFolder/getAppFolder to Server.
2013-09-23 23:57:39 +02:00
7cad510f28
Fix conflict
2013-09-23 23:48:28 +02:00
60bff6c589
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 23:39:36 +02:00
be402fab53
Forgot to return false if add() didn't add anything.
2013-09-23 23:39:36 +02:00
8a02afd87a
Added more error checking in add()
2013-09-23 23:39:36 +02:00
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
b63acdb125
fixing namespaces and rename hasCategory to hasTag
2013-09-23 23:39:36 +02:00
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
5ca181eb23
More trimming
2013-09-23 23:36:47 +02:00
e55f25b64d
handle error situation of rename proper
2013-09-23 22:04:37 +02:00
5d671a84b2
Merge pull request #4869 from owncloud/fixing-4866-master
...
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
910a0338bb
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 15:52:06 +02:00
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
93258e1170
Forgot to return false if add() didn't add anything.
2013-09-23 13:29:21 +02:00
0b4de847a9
Added more error checking in add()
2013-09-23 13:27:43 +02:00
Thomas Müller
Andreas Fischer
Arthur Schiwon
Frank Karlitschek
Morris Jobke
Michael Gapczynski
Vincent Petry
Georg Ehrke
Björn Schießle
Bjoern Schiessle
Tom Needham
Thomas Tanghus
VicDeo
Axel Roenn
Robin Appelman
Victor Dubiniuk
Bart Visscher
Bernhard Posselt
Markus Goetz
Evgeni Golov