Thomas Müller
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +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
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
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
Thomas Tanghus
b0762ad3bf
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-18 00:37:00 +02:00
Thomas Tanghus
e760343b98
Merge branch 'appframework-master' into vcategories_public
2013-09-17 20:04:51 +02:00
Thomas Tanghus
8b4f4a79e2
Still some session leftovers.
2013-09-17 19:46:08 +02:00
Jörn Friedrich Dreyer
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
Thomas Tanghus
5bddb5377a
Purge session from Request - and fix some styles
2013-09-17 18:38:18 +02:00
Thomas Tanghus
5c19b995db
Add interface for Session and add getter in server container.
2013-09-17 18:31:14 +02:00
Thomas Tanghus
1a13062701
Add legacy wrapper
2013-09-17 18:02:37 +02:00
Thomas Tanghus
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
Thomas Müller
b9e943f5d5
fix naming
2013-09-17 09:42:14 +02:00
Thomas Müller
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
Thomas Müller
822daa8f8a
class files have to be lowercase
2013-09-17 00:27:22 +02:00
Thomas Müller
981a41e2cd
adding interface for middleware
2013-09-17 00:26:55 +02:00
Thomas Müller
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
Andreas Fischer
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
Bart Visscher
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
Thomas Müller
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
Bjoern Schiessle
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
Thomas Tanghus
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 02:17:39 +02:00
Thomas Müller
5d4e9e0d25
/OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized
...
This fixes unit test execution
2013-09-15 23:07:18 +02:00
Thomas Müller
af0069bf03
adding getRootFolder() to server container and hooking up the new files api
2013-09-15 22:24:57 +02:00
Thomas Müller
ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
Thomas Müller
0f4e214a90
adding null check on a mount's storage
2013-09-15 20:40:40 +02:00
Bernhard Posselt
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
Jenkins for ownCloud
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
Thomas Müller
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
Thomas Müller
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
Thomas Müller
4da8fc6907
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
2013-09-13 20:57:18 +02:00
Thomas Müller
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
Thomas Müller
049e57ac4a
remove unused OC_L10N
2013-09-13 17:41:09 +02:00