wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14517 commits 157 branches 562 tags 714 MiB
Commit graph

5018 commits

Author SHA1 Message Date
Thomas Tanghus
47b2007228 Remove misleading IMiddleware interface 2013-10-05 19:13:12 +02:00
Thomas Tanghus
0501a947bc Merge pull request #5116 from owncloud/interfaces2 
More Interfaces for the public api
 2013-10-05 08:35:50 -07:00
Thomas Tanghus
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
Frank Karlitschek
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
Frank Karlitschek
a82211220c Merge pull request #5125 from owncloud/fixing-5122-master 
upload abortion detection only for PUT
 2013-10-05 02:25:45 -07:00
Frank Karlitschek
4bce2f8b85 Merge pull request #5123 from owncloud/cache_mimetypes 
Load all mimetypes in one go
 2013-10-05 02:24:38 -07:00
Victor Dubiniuk
8da1aac1d0 Check result only once 2013-10-04 23:24:38 +03:00
Thomas Müller
414b2eb4b6 upload abortion detection only for PUT 
e.g. LOCK would break with this approach
 2013-10-04 20:20:33 +02:00
Bart Visscher
21cbef0d2c passesCSRFCheck added to OCP\IRequest 2013-10-04 18:13:04 +02:00
Bart Visscher
61a9098b7d Add Helper and URLGenerator interfaces to server container 2013-10-04 18:11:02 +02:00
Bart Visscher
ce9436c051 OC_Defaults is only used in error reporting 2013-10-04 18:11:02 +02:00
Bart Visscher
9f777fba98 Add L10N interface to server container 2013-10-04 18:11:02 +02:00
Bart Visscher
bae121b16d Merge pull request #5068 from owncloud/improved_request 
Improved request
 2013-10-04 09:05:20 -07:00
Victor Dubiniuk
ef65037211 Make mimetypes static. Jenkis will be happy 2013-10-04 18:09:42 +03:00
Victor Dubiniuk
65750cb244 Load all mimetypes in one go 2013-10-04 16:17:19 +03:00
Vincent Petry
48a4c67d48 Merge pull request #5087 from owncloud/templatefunction-relativedate 
Added dateOnly argument to relative_modified_date
 2013-10-04 05:53:13 -07:00
Vincent Petry
f3594904c2 Removed $fromTime argument from public template API 2013-10-04 14:45:12 +02:00
Thomas Müller
aebc330f26 Merge branch 'master' into fixing-4011-master 2013-10-04 14:06:42 +02:00
Markus Goetz
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
Bjoern Schiessle
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
Frank Karlitschek
47666796a7 ups. remove debug 2013-10-04 09:42:38 +02:00
Frank Karlitschek
e49ee47e7b use Filesystem::isIgnoredDir 2013-10-04 09:28:46 +02:00
Frank Karlitschek
f0a98cc923 fix typo 2013-10-04 09:25:54 +02:00
Frank Karlitschek
6d95436695 add public static 2013-10-04 09:24:07 +02:00
Frank Karlitschek
e40afbebc6 make it possible to prepopulate a new user gome with a skeleton 2013-10-03 23:22:11 +02:00
Markus Goetz
7f7718888d DAV: Use fileinfo_cache for ETag 2013-10-03 17:09:08 +02:00
Vincent Petry
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
Vincent Petry
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
Thomas Tanghus
aedc427ffd Fix fix of POST :P 2013-10-03 03:56:37 +02:00
Thomas Tanghus
8a018d7a59 Fix POST decoding 2013-10-03 01:43:33 +02:00
Thomas Müller
9c23c3449b Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	core/css/share.css
 2013-10-02 23:33:50 +02:00
Thomas Tanghus
965ce5719f Modified PUT behaviour 
Now only non-parable PUT requests return a stream resource.
 2013-10-02 22:13:40 +02:00
Vincent Petry
ed14541aea Removed stray debug log write 2013-10-02 16:44:38 +02:00
Vincent Petry
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
Andreas Fischer
aa34438d06 Also replace ApacheBackend with Authentication\IApacheBackend in user. 2013-10-02 15:11:49 +02:00
Thomas Müller
621ab1c7ee fixing various PHPDoc comments 2013-10-02 15:04:42 +02:00
Thomas Müller
4d4eda0f06 fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend 2013-10-02 15:03:52 +02:00
Thomas Müller
8c77cd1901 remove obsolete function login() 2013-10-02 14:49:14 +02:00
Thomas Müller
78c60c25c8 only perform files upgrade in case there are actually entries in the old fscache table 2013-10-02 13:00:05 +02:00
Thomas Müller
1adadf36fc Merge pull request #5071 from owncloud/fix-autoloader-master 
Fix autoloader regression
 2013-10-02 03:10:10 -07:00
Bjoern Schiessle
8b08b1b455 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/private/util.php
 2013-10-02 10:11:18 +02:00
Thomas Müller
0d7c36c9f1 adding PHPDoc comment 2013-10-02 01:13:02 +02:00
Thomas Müller
4cecede13d code cleanup - remove special case for webdav in handleApacheAuth() 2013-10-02 00:55:35 +02:00
Thomas Müller
7e9e23f210 Merge branch 'master' into apache-auth-master 2013-10-02 00:21:11 +02:00
Victor Dubiniuk
5bb4330ea4 Fix autoloader regression 2013-10-02 00:58:51 +03:00
Thomas Müller
9eab8b39df Merge branch 'master' into fixing-4620-master 2013-10-01 22:57:46 +02:00
Thomas Müller
0537960dcc adding getCurrentUserId() to ApacheBackend 2013-10-01 22:56:47 +02:00
Thomas Tanghus
a2cabd4c2a Remove getContent() from IRequest 2013-10-01 20:15:04 +02:00
Thomas Tanghus
0f13ffb773 Remove JSON request parsing from Server 2013-10-01 20:15:04 +02:00
Thomas Tanghus
973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus
36d1156cf8 Add interface docs to IRequest. 2013-10-01 20:13:13 +02:00
Thomas Tanghus
cd2e1d0cfe Add patch method to OC_Route 2013-10-01 20:13:13 +02:00
Thomas Tanghus
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
Thomas Tanghus
8603f956ab Get urlParams registered before Request is instantiated 2013-10-01 19:03:34 +02:00
Thomas Müller
e2fe71b6e7 Merge branch 'master' into lib-private-master-2 2013-10-01 16:11:59 +02:00
Thomas Müller
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
Thomas Müller
02d6976263 Merge branch 'master' into lib-private-master-2 2013-09-30 21:29:58 +02:00
Thomas Müller
7c659eb291 use public api for session access from server container 2013-09-30 20:28:00 +02:00
Thomas Müller
bed27b603d Merge branch 'master' into channels 
Conflicts:
	lib/util.php
 2013-09-30 20:21:51 +02:00
Frank Karlitschek
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
Frank Karlitschek
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
Frank Karlitschek
b948c1a1b6 prepare the updater for the new update channels 2013-09-30 20:14:18 +02:00
Thomas Müller
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
Thomas Müller
8e0060405d reorganize file in lib 2013-09-30 16:39:03 +02:00
Thomas Müller
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
Jenkins for ownCloud
a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Morris Jobke
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
Thomas Müller
c2b6775efc adding : 2013-09-30 13:27:46 +02:00
Thomas Müller
5e0cc6b5a6 adding copyright and PHPDocs 2013-09-30 13:12:51 +02:00
Thomas Müller
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
Thomas Müller
480aeb804f Merge pull request #4459 from owncloud/appframework-master 
Public API for OC6+ (includes AppFramework)
 2013-09-30 04:11:28 -07:00
Thomas Müller
a2301e8b69 Merge branch 'master' into fixing-4546-master 
Conflicts:
	lib/connector/sabre/directory.php
 2013-09-30 11:45:52 +02:00
Thomas Müller
c62dc4fa80 Merge branch 'master' into fixing-4011-master 
Conflicts:
	lib/connector/sabre/directory.php
 2013-09-30 11:36:08 +02:00
Thomas Müller
92c02e6797 remove commented code 2013-09-30 10:58:03 +02:00
Thomas Müller
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
Thomas Müller
629faf6d34 Merge branch 'master' into appframework-master 2013-09-30 10:42:05 +02:00
Thomas Müller
fe352664a2 Merge branch 'master' into fixing-4546-master 
Conflicts:
	lib/connector/sabre/directory.php
 2013-09-30 10:06:36 +02:00
Bjoern Schiessle
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
Thomas Müller
aaba0d83b5 fixing PHPDoc & typo 2013-09-30 10:03:07 +02:00
Thomas Müller
952433eae6 Merge branch 'master' into move-aborted-upload-detection-into-plugin-master 2013-09-30 09:21:37 +02:00
Thomas Müller
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
Evgeni Golov
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
Andreas Fischer
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
Thomas Müller
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
Thomas Müller
48b5c1d5f9 initial implementation of activity manager 2013-09-29 20:31:12 +02:00
Thomas Müller
2e1e283592 Merge branch 'appframework-master' into activities-api 
Conflicts:
	lib/public/iservercontainer.php
 2013-09-29 20:10:07 +02:00
Thomas Müller
adcb738e47 initialize $middleWares 2013-09-28 20:40:25 +02:00
Thomas Müller
57f37c876b delay middleware registrations 2013-09-27 17:15:26 +02:00
Thomas Müller
adff34cb8a fixing error in initialization of TagManager 2013-09-27 17:08:48 +02:00
Thomas Müller
687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Thomas Müller
735608f513 Merge pull request #4207 from owncloud/search_shared_files 
add initial search in shared files
 2013-09-27 05:18:12 -07:00
Bjoern Schiessle
03d5ea6cec check not only if the keyfile folder exists but also if it contains keyfiles 2013-09-27 13:34:48 +02:00
Morris Jobke
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
Jenkins for ownCloud
f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Bjoern Schiessle
9bb244cc59 check every enabled app if the remember login feature needs to be disabled 2013-09-26 19:34:28 +02:00
Thomas Müller
e515509a81 prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded 2013-09-26 13:34:47 +02:00
Thomas Müller
a86c10984a catching NotPermittedException and throw it to the dav client as 403 2013-09-26 11:50:46 +02:00
Thomas Müller
b11d8799c1 adding unit tests for ObjectTree::move() 2013-09-26 10:50:15 +02:00
Thomas Müller
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
Thomas Müller
0c44cdd4ea remove unneccessary code 2013-09-25 17:28:45 +02:00
Thomas Müller
5e27ac4b1a $path already contains the full path to the file 2013-09-25 17:17:29 +02:00
Thomas Müller
09b64535a9 fixing copyright and add class documentation 2013-09-25 17:05:14 +02:00
Arthur Schiwon
1c976a7c9b manager checkPassword now returns User object, adjust internal user class accordingly. 2013-09-25 15:03:22 +02:00
Thomas Müller
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
Bjoern Schiessle
acd3c11e47 use OC_DB::executeAudited 2013-09-25 12:18:29 +02:00
Bjoern Schiessle
5a9e473a79 use OC_DB::executeAudited 2013-09-25 12:15:46 +02:00
Bjoern Schiessle
3cd0caa643 set default value for expire parameter 2013-09-25 12:15:30 +02:00
Bjoern Schiessle
883d1c0df3 use template for txt and html mails to send notification mails 2013-09-25 11:51:28 +02:00
Thomas Müller
30286c06ab stripos return value check 2013-09-25 11:05:59 +02:00
Thomas Müller
b168d5aa3b class API decommissioning part 1 2013-09-25 11:05:24 +02:00
Thomas Müller
b2ef978d10 AppFramework: 
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
 2013-09-25 10:30:48 +02:00
Thomas Müller
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
Bjoern Schiessle
ca47fc5f18 fix PHPDoc 2013-09-24 19:37:24 +02:00
Jenkins for ownCloud
2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Bjoern Schiessle
0637dad0b3 some small fixes 2013-09-24 18:52:20 +02:00
Bjoern Schiessle
c486fc7608 introduce OC_Util::rememberLoginAllowed() 2013-09-24 18:01:34 +02:00
Thomas Tanghus
aaed871cee Add factory class for the server container. 2013-09-24 17:10:01 +02:00
Arthur Schiwon
14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Thomas Müller
84a0e6930b creating non static getETagPropertyForPath() 
adding public $fileView to Node to allow unit testing
 2013-09-24 15:35:21 +02:00
Thomas Müller
4e7f82ef04 unify duplicate code 2013-09-24 15:14:42 +02:00
Thomas Müller
cf9dbc6e34 adding error handling on file_put_contents within the web dav implementation 2013-09-24 14:25:56 +02:00
Arthur Schiwon
63324e2347 Fix doc 2013-09-24 14:12:44 +02:00
Arthur Schiwon
0a7ee7c3f7 Fix return value from User object to User ID 2013-09-24 14:11:47 +02:00
Thomas Müller
e9eb34f187 duplicate code :sigh: - will fix this in a second pr 2013-09-24 13:54:18 +02:00
Thomas Müller
6c5466a540 adding file_exists check just to be on the save side 2013-09-24 13:53:32 +02:00
Arthur Schiwon
fe88a62d6e === not == 2013-09-24 13:51:33 +02:00
Arthur Schiwon
d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Thomas Müller
ee1f627155 adding privilege check on move and rename operations 2013-09-24 13:26:12 +02:00
Bjoern Schiessle
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
Georg Ehrke
31d2048eb8 add blacklist to txt preview backend 2013-09-24 11:00:08 +02:00
Thomas Müller
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
Andreas Fischer
2129974584 Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). 2013-09-24 00:59:23 +02:00
Robin Appelman
235517f111 clear permissions cache when scanning a file 2013-09-24 00:57:58 +02:00
Thomas Tanghus
8c469394e6 Remove duplicate method definitions 2013-09-24 00:12:23 +02:00
Thomas Tanghus
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
Thomas Tanghus
f2de5a34ef Don't try to be clever 2013-09-24 00:04:57 +02:00
Thomas Tanghus
4d3e7fa78a Add getUserFolder/getAppFolder to Server. 2013-09-23 23:57:39 +02:00
Thomas Tanghus
7cad510f28 Fix conflict 2013-09-23 23:48:28 +02:00
Thomas Tanghus
60bff6c589 Use fetchOne() instead of numRows() when doing a COUNT(*). 2013-09-23 23:39:36 +02:00
Thomas Tanghus
be402fab53 Forgot to return false if add() didn't add anything. 2013-09-23 23:39:36 +02:00
Thomas Tanghus
8a02afd87a Added more error checking in add() 2013-09-23 23:39:36 +02:00
Thomas Tanghus
1bbeb12e2e Updated method names and added a few more tests. 2013-09-23 23:39:36 +02:00
Thomas Müller
b63acdb125 fixing namespaces and rename hasCategory to hasTag 2013-09-23 23:39:36 +02:00
Thomas Tanghus
45f73feb69 OC_VCategories=>OC\Tags. Public interface + getter in server container 2013-09-23 23:39:36 +02:00
Thomas Tanghus
5ca181eb23 More trimming 2013-09-23 23:36:47 +02:00
Thomas Müller
e55f25b64d handle error situation of rename proper 2013-09-23 22:04:37 +02:00
Thomas Müller
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
Thomas Tanghus
910a0338bb Use fetchOne() instead of numRows() when doing a COUNT(*). 2013-09-23 15:52:06 +02:00
Andreas Fischer
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
Thomas Tanghus
93258e1170 Forgot to return false if add() didn't add anything. 2013-09-23 13:29:21 +02:00
Thomas Tanghus
0b4de847a9 Added more error checking in add() 2013-09-23 13:27:43 +02:00
Andreas Fischer
4a9f1cc74d Merge remote-tracking branch 'owncloud/master' into fixing-4866-master 
* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
	tests/lib/files/cache/scanner.php
 2013-09-23 12:44:11 +02:00
Bjoern Schiessle
fc76a13c52 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/public/share.php
 2013-09-23 11:18:00 +02:00
Björn Schießle
9851f0f4f2 Merge pull request #4896 from owncloud/sharing_allow_disable_password 
sharing, allow user to disable password protection
 2013-09-23 01:20:09 -07:00
Thomas Müller
03eedb58fc Merge pull request #4327 from owncloud/scanfile-remove 
remove deleted files while scanning
 2013-09-22 22:40:13 -07:00
Bart Visscher
811f680457 Merge pull request #4623 from owncloud/convert-oc_preferences 
Convert OC_Preference to object interface
 2013-09-22 10:45:56 -07:00
Jenkins for ownCloud
28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Robin Appelman
a1d4eb1f95 files: when filtering search results, ensure results are children of the fakeroot not just path starting the same 2013-09-22 01:24:12 +02:00
Andreas Fischer
2a17025d53 Move bool to int conversion to buildParts(), so it also happens for update(). 2013-09-21 02:20:01 +02:00
Andreas Fischer
011bca7b7f Only update the etag. Do not re-submit any other unchanged data. 2013-09-20 23:53:02 +02:00
Andreas Fischer
a2f82da572 Use update() instead of put(). 2013-09-20 23:52:05 +02:00
Bart Visscher
0c6dcdba6b Add missing implements and fix parameters in IConfig 2013-09-20 22:45:22 +02:00
Thomas Müller
d3d52dd23f PHPDoc & get UserManager from container for RooFolder 2013-09-20 21:57:48 +02:00
Thomas Müller
f83f323269 fixing typos + adding missing filed $activeEntry 2013-09-20 21:45:27 +02:00
Thomas Müller
e31f6c01e8 fixing PHPDoc 2013-09-20 21:43:17 +02:00
Thomas Müller
9116303cfc fixing typos 2013-09-20 21:40:54 +02:00
Thomas Müller
d84d548618 when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy 2013-09-20 20:34:17 +02:00
Bart Visscher
e92abfd4d8 Add Config container class to server container 2013-09-20 20:21:24 +02:00
Bart Visscher
e3013c5801 Add Navigation class to server container 2013-09-20 20:20:01 +02:00
Jenkins for ownCloud
5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Thomas Müller
1b59003d6d adding basic interfaces for the activities api 2013-09-20 16:37:52 +02:00
Bart Visscher
aa8a85f77d Add DBConnection to server container 2013-09-20 14:33:45 +02:00
Bart Visscher
ac73ce1b2a Add UserSession to server container 2013-09-20 14:32:43 +02:00
Bjoern Schiessle
944e9b8c69 make sure that both $permissions and $oldPermissions have the same type 2013-09-20 12:40:21 +02:00
Bart Visscher
8e26f291a7 Merge pull request #4684 from owncloud/improved-console 
Use more object oriented way for console commands
 2013-09-19 14:22:32 -07:00
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Bart Visscher
0a2a4cb12e update inherit docs comment 2013-09-19 18:59:06 +02:00
Bart Visscher
55efe1e56c Fix insert/update/delete helper functions for oracle 2013-09-19 18:13:39 +02:00
Bart Visscher
f6284bdce7 Add missing return true statements to legacy preferences functions 2013-09-19 18:13:06 +02:00
Bart Visscher
395cc737a1 Add missing static 2013-09-19 18:13:06 +02:00
Bart Visscher
445d34a2a9 Convert OC_Preference to object interface 2013-09-19 18:13:06 +02:00
Jörn Friedrich Dreyer
9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto 
initial scrollto implementation
 2013-09-19 05:49:45 -07:00
Thomas Tanghus
9e4d13858c Fix syntax error 2013-09-19 13:27:41 +02:00
Thomas Tanghus
d5126dd6b4 Merge branch 'appframework-master' into server_folder_methods 2013-09-19 12:32:32 +02:00
Thomas Tanghus
314ca843e8 Updated method names and added a few more tests. 2013-09-19 11:27:13 +02:00
Thomas Müller
76f8be3b7a fixing namespaces and rename hasCategory to hasTag 2013-09-18 22:49:09 +02:00
Thomas Müller
690e98d45a Merge branch 'appframework-master' into vcategories_public 
Conflicts:
	lib/server.php
 2013-09-18 22:36:25 +02:00
Thomas Müller
1274d6116d updating php docs 2013-09-18 22:22:51 +02:00
Jenkins for ownCloud
6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Thomas Tanghus
09d043729a Note to self 2: Do as you preach. Test! 2013-09-18 15:02:25 +02:00
Thomas Tanghus
79cd655920 Note to self: Test before pushing!!! 2013-09-18 14:50:21 +02:00
Thomas Tanghus
2ef0b58ff6 Don't try to be clever 2013-09-18 14:25:12 +02:00
Thomas Tanghus
dd62ccdb4e Merge branch 'appframework-master' into public_cache 
Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
 2013-09-18 13:20:07 +02:00
Thomas Tanghus
534933ee9b Use new emitter system 2013-09-18 13:15:38 +02:00
Thomas Tanghus
442a2e074c Update to adhere to the coding guidelines. 2013-09-18 12:35:46 +02:00
Thomas Tanghus
6ba23912a7 Add getUserFolder/getAppFolder to Server. 2013-09-18 12:34:10 +02:00
Thomas Tanghus
d3f88ceeb4 Add some docs to the sessions interface. 2013-09-18 12:01:01 +02:00
Bjoern Schiessle
1a60aa2b6a only remember password if the user changes the permissions, otherwise the user disabled the password protection 2013-09-18 11:49:02 +02:00
Thomas Müller
ce58c32c90 using OC_Config::$object->setValue in order to get the underlying exception thrown up to the caller 2013-09-18 11:07:19 +02:00
Thomas Müller
5ae4d67540 in case the cache cannot be initialized within the autoloader we just shoul not use it 2013-09-18 11:06:00 +02:00