Robin Appelman
488fc402e4
remove unneeded check
2014-05-28 18:16:23 +02:00
Robin Appelman
d15ed9b4d3
use \OC\Files\Filesystem::isIgnoredDir
2014-05-28 18:16:23 +02:00
Robin Appelman
ea44f0e20f
fix recursive copy and rename for common storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
c3c9612c99
fix recursive copy and rename for mapped local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
03ba497a8c
add recursive copy to local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
38c1da0976
fix recursive rename for local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
e83b41493f
remove unneeded delTree
2014-05-28 18:16:23 +02:00
Thomas Müller
a2e4bc8d33
# This is a combination of 2 commits.
...
# The first commit's message is:
adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path
# This is the 2nd commit message:
fix too long path
2014-05-28 15:30:44 +02:00
ringmaster
3d1ba574e4
Change visibility of scanner internals
...
so that descendant classes can access them.
2014-05-28 07:59:38 -04:00
Vincent Petry
09645b9221
Merge pull request #8755 from owncloud/fix-8737-master
...
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 10:57:54 +02:00
Jenkins for ownCloud
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
Bernhard Posselt
5e9ea2b365
fix 8757, get rid of service locator antipattern
2014-05-28 02:15:16 +02:00
Thomas Müller
f03a3d9d05
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 00:13:54 +02:00
Volkan Gezer
c100da33bb
upgraded phpmailer into v5.2.8 via composer
2014-05-27 23:33:18 +02:00
Bart Visscher
a51e9a5cfe
Merge pull request #8136 from owncloud/contactsmanager-register
...
Implement the register function of OC\ContactsManager
2014-05-27 22:35:50 +02:00
ringmaster
26d169b27c
Use 'filesystem_check_enable' as a config option.
2014-05-27 16:01:16 -04:00
ringmaster
3b287f8274
Allow the default behavior to come from the config.
2014-05-27 15:21:35 -04:00
ringmaster
fdf26c5a3f
Rename variable to something more appropriate.
2014-05-27 15:12:56 -04:00
ringmaster
645e7035a4
Allow apps to control via a hook to skip adding/removing a file during filescan
2014-05-27 15:12:54 -04:00
Vincent Petry
02f682b156
Now showing disabled apps as upgrade status line
...
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
2014-05-27 15:20:33 +02:00
Vincent Petry
146583a98d
Added update overview page
2014-05-27 14:53:08 +02:00
Vincent Petry
d43a7c5f6e
Added requiremin/requiremax fields for apps
...
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
2014-05-27 11:54:12 +02:00
Jenkins for ownCloud
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
Bernhard Posselt
c2330e558e
rename to apps.js
2014-05-26 17:31:41 +02:00
Arthur Schiwon
3a21c3e2f4
Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp
2014-05-26 13:56:40 +02:00
Arthur Schiwon
4a4ea67a31
drop superflous statement in phpdoc
2014-05-26 13:56:08 +02:00
Arthur Schiwon
748a219243
add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
2014-05-26 13:53:26 +02:00
Vincent Petry
a34491e288
Merge pull request #8687 from owncloud/recursive-remove-smb
...
Make the recursive delete more robust
2014-05-26 11:06:13 +02:00
Frank Karlitschek
48d0cebc42
Merge pull request #8674 from owncloud/watch-policy
...
Add a config option for setting the filesystem watcher policy
2014-05-26 10:48:44 +02:00
Jenkins for ownCloud
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
Jenkins for ownCloud
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
Lukas Reschke
c03e7fcfa9
Clarify comment
2014-05-24 10:24:42 +02:00
Jenkins for ownCloud
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
Bernhard Posselt
db1511a11d
add a slideup mechanism
2014-05-23 18:49:16 +02:00
Robin Appelman
be8326668a
Make the recursive delete more robust
2014-05-23 13:31:45 +02:00
Robin Appelman
8b56d52398
Make the session available as early as possible
2014-05-23 13:27:27 +02:00
Robin Appelman
151c48494e
Add a config option fro setting the filesystem watcher policy
2014-05-23 12:20:31 +02:00
Arthur Schiwon
2e85d5a852
increase scrutinizer happyiness by removing minor/informational issues
2014-05-23 11:20:46 +02:00
Björn Schießle
050df76830
Merge pull request #8599 from owncloud/sharing_disable_for_groups
...
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Robin Appelman
ff1f341d97
Fix phpdoc
2014-05-22 13:30:32 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Vincent Petry
25ecd2bdda
Merge pull request #8659 from owncloud/get-preference-multiple-user
...
Add a method to get the values for multiple users to OC\Preferences
2014-05-22 09:59:20 +02:00
Björn Schießle
14a953fbe0
Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
...
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
Arthur Schiwon
2c89962919
clean up tryRememberLogin and save the timestamp of users last login
2014-05-21 18:03:37 +02:00
Joas Schilling
e20fb37038
Correctly create list of placeholders
2014-05-21 14:35:59 +02:00
Bjoern Schiessle
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
Joas Schilling
4fbfe077fb
Move return to new line
2014-05-21 13:10:23 +02:00
Joas Schilling
cf3cd572b0
Add a method to get the values for multiple users to OC\Preferences
2014-05-21 11:14:52 +02:00
scolebrook
954d5b27ff
use custom logfile path if defined, otherwise use default of owncloud.log in data directory
2014-05-20 11:29:59 -04:00
Jenkins for ownCloud
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
Thomas Müller
06af8e09da
adding annotation check to checkServer()
2014-05-19 21:51:35 +02:00
Thomas Müller
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
Thomas Müller
8749442fec
no return on register and unregister
2014-05-19 21:39:19 +02:00
Thomas Müller
bb6fac1102
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Thomas Müller
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
Thomas Müller
f8cb8f4803
Merge branch 'master' into csrf-on-login-and-logout
...
Conflicts:
core/templates/login.php
2014-05-19 20:40:55 +02:00
Thomas Müller
b6d2d6329d
Merge pull request #8639 from owncloud/drop-brief
...
Remove all occurences of @brief and @returns from PHPDoc
2014-05-19 20:18:32 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Frank Karlitschek
090d127050
Merge pull request #6457 from owncloud/db-convert-tool
...
Command line tool to convert current database to others, except sqlite
2014-05-19 16:41:31 +01:00
Thomas Müller
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Thomas Müller
04e6c12fe2
Merge pull request #8557 from owncloud/custom_session_handling
...
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
Morris Jobke
48977c8579
Merge pull request #7286 from owncloud/issue/4823
...
Set expiration date by default when adding additional shares
2014-05-19 10:26:54 +02:00
Jenkins for ownCloud
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
Joas Schilling
ab7ae004f7
Automatically copy the share expiration date when new shares are created
...
Fix #4823
2014-05-19 01:38:47 +02:00
Morris Jobke
804020bb6d
Merge pull request #7363 from owncloud/optimize-startup-queries
...
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Jenkins for ownCloud
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
Björn Schießle
42b99b6d0f
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
...
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle
7a48f24459
use default expire date only for link shares
2014-05-16 18:12:13 +02:00
Bjoern Schiessle
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
Vincent Petry
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Jenkins for ownCloud
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
Vincent Petry
04f73275ba
Now settings CSS class with appid in content DIV
2014-05-15 17:51:04 +02:00
Thomas Müller
7abe3b1989
Merge pull request #8587 from Raydiation/master
...
Small cleanup and language detection for apps
2014-05-15 12:22:47 +02:00
Jenkins for ownCloud
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
Jenkins for ownCloud
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
Bernhard Posselt
d8020c3506
use registerService method instead of array access
2014-05-14 01:09:48 +02:00
Bernhard Posselt
9e36c33104
use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability
2014-05-14 01:09:48 +02:00
Bernhard Posselt
512373fadf
provide a way to detect the language that is being used (e.g. for clientside javascript language selection
2014-05-14 01:09:48 +02:00
Thomas Müller
37ba6f503a
fixing variable naming
2014-05-13 19:09:15 +01:00
Thomas Müller
fa503a4772
fix PHPDoc
2014-05-13 19:09:15 +01:00
Thomas Müller
650a55e2ba
object -> \OC\Preview
2014-05-13 19:09:14 +01:00
Thomas Müller
7853bc4cac
adding PHPDoc
2014-05-13 19:09:14 +01:00
Thomas Müller
147007bdd8
fixing typo and missing @throws
2014-05-13 19:09:14 +01:00
Robin McCorkell
4755392c65
More PHPDoc for file functions
2014-05-13 19:09:14 +01:00
Robin McCorkell
f7e777f7d2
Fix various code errors detected by Scrutinizer
...
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell
bac8962bbc
Fix Scrutinizer errors
2014-05-13 19:08:14 +01:00
Robin McCorkell
bd3bf4b507
Change parameter order of implode
2014-05-13 19:08:14 +01:00
Robin McCorkell
8ab01599a9
Use OC_User_Interface instead of OC_User_Backend
2014-05-13 19:08:14 +01:00
Lukas Reschke
7e448a376f
Fix PHPDoc and typos
...
Some things my IDE complained about while creating a custom backend.
Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.
Conflicts:
lib/private/group/database.php
lib/private/group/dummy.php
lib/private/group/example.php
2014-05-13 19:08:14 +01:00
Robin McCorkell
3bed3d2a23
Change parameter type for useBackend
2014-05-13 19:08:14 +01:00
Robin McCorkell
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a
Squash 'a | b' into 'a|b', in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b
Replace @returns with @return, in /lib
2014-05-13 19:08:14 +01:00
Thomas Müller
f5bc680f9c
Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
...
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry
bab8c1f8e5
Fixed getAbsolutePath case when path is "0"
...
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Björn Schießle
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
Bernhard Posselt
a152e320f6
make it possible to omit parameters and use the default parameters from the controller method
2014-05-13 10:40:49 +02:00
Vincent Petry
e3f6abf1f0
Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
...
Rotate thumbnail when encryption is enabled
2014-05-13 10:27:41 +02:00
Jenkins for ownCloud
a60db322c2
[tx-robot] updated from transifex
2014-05-13 01:55:41 -04:00
Thomas Müller
8314e5f4d1
fixing typos and adding PHPDoc
2014-05-12 21:58:09 +02:00
Thomas Müller
408189b7e4
Merge pull request #8556 from owncloud/kill-legacy-code-master
...
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke
aea44ee0d5
Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
...
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Thomas Müller
ee8a7b53da
Merge pull request #8553 from owncloud/fix-8549-master
...
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
2014-05-12 17:45:08 +02:00
ringmaster
75bc25f906
Allow apps to create custom session handlers.
2014-05-12 11:08:28 -04:00
Thomas Müller
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller
f5ed92bf31
remove legacy aka deprecated code: OC_Cache_FileGlobalGC
2014-05-12 16:34:47 +02:00
Thomas Müller
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
Thomas Müller
33987eea83
remove legacy aka deprecated code: OC_Cache
2014-05-12 16:23:33 +02:00
Thomas Müller
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
Thomas Müller
3cd32dcb7c
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place
2014-05-12 15:14:01 +02:00
Morris Jobke
9d95fff427
fix missing spaces
2014-05-12 13:32:03 +02:00
Thomas Müller
da0e37ef03
Rotate thumbnail when encryption is enabled
...
When a picture is encrypted, save it to a temporary file first so that
the PHP function for rotation can access it as file.
2014-05-12 11:27:39 +02:00
Thomas Müller
d853c60d7e
adding interpolation as requested by PSR-3
2014-05-12 10:54:09 +02:00
Jenkins for ownCloud
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
Morris Jobke
2054837d01
Merge pull request #8541 from owncloud/hardenIsSubDirectory
...
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
Morris Jobke
6499995474
Merge pull request #8477 from owncloud/better-controllers
...
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13
Merge pull request #8274 from owncloud/appframework-db
...
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt
63f2f16b85
use new controllermethodreflector for corsmiddleware
2014-05-11 17:55:59 +02:00
Bernhard Posselt
474b8f071d
Fix typo
2014-05-11 17:54:09 +02:00
Bernhard Posselt
3e58a767ad
Fix method signature
2014-05-11 17:54:09 +02:00
Bernhard Posselt
fcb1aa36f0
default to null to not fail if type is not annotated via phpdoc
2014-05-11 17:54:09 +02:00
Bernhard Posselt
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
Bernhard Posselt
c590244fa1
add private property for reflector in security middleware
2014-05-11 17:54:08 +02:00
Bernhard Posselt
ede7325772
fix broken if
2014-05-11 17:54:08 +02:00
Bernhard Posselt
d8da79cab0
add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST
2014-05-11 17:54:08 +02:00
Bernhard Posselt
4dca2038bf
add request to dispatcher class
2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
Bernhard Posselt
a252f59cd4
Merge pull request #8504 from owncloud/cors-middleware
...
Add cors middleware
2014-05-11 16:54:34 +02:00
Lukas Reschke
fd5b2d11d6
Rename issubdirectory to isSubDirectory
2014-05-11 15:50:59 +02:00
Lukas Reschke
a40e49cae5
Harden issubdirectory()
...
realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false
2014-05-11 15:49:19 +02:00
Lukas Reschke
cd3ed01483
Fix Typo
...
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +02:00
Bernhard Posselt
e05192a23d
Fix method signature
2014-05-11 14:03:58 +02:00
Lukas Reschke
e1e1009ccc
Redirect to index if the logout link is accessed without valid session
...
This is needed to prevent "Token expired" messages while login if a session is expired
@see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
2014-05-11 13:09:46 +02:00
Bernhard Posselt
3af30625ab
Make db connection protected
2014-05-11 12:54:44 +02:00
Jenkins for ownCloud
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
Jenkins for ownCloud
05ea8c8a10
[tx-robot] updated from transifex
2014-05-10 01:55:50 -04:00
Bernhard Posselt
9a4d204b55
add cors middleware
...
remove methodannotationreader namespace
fix namespace for server container
fix tests
fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request
remove uneeded local in cors middleware registratio
dont uppercase cors to easily use it from routes
fix indention
comment fixes
explicitely set allow credentials header to false
dont depend on better controllers PR, fix that stuff later
split cors methods to be in a seperate controller for exposing apis
remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Bernhard Posselt
b4298c68ca
- make logger available in the container
...
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +02:00
Thomas Tanghus
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
Lukas Reschke
1083085e6e
Merge pull request #7546 from owncloud/no_freaking_tag_dupes
...
Tags cleanup
2014-05-09 22:10:45 +02:00
Thomas Müller
e5ee84ca9b
- update permissions
...
- change xml tag to perm
2014-05-09 17:18:43 +02:00
Andreas Fischer
bd4d315d78
Merge pull request #8512 from owncloud/fix-memcached-hasKey
...
Be more strict in checking the resultCode of memcached hasKey function
* owncloud/fix-memcached-hasKey:
Memcached hasKey should test for success, the get can fail for other reasons.
2014-05-09 12:41:46 +02:00
Jenkins for ownCloud
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
Vincent Petry
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
Bart Visscher
88225db4af
Memcached hasKey should test for success, the get can fail for other reasons.
...
One of the other failures is no running server.
2014-05-08 18:11:29 +02:00
Vincent Petry
05dc694c5c
Fix getPathById for Oracle
...
Added extra code to handle the case of Oracle which saves empty strings
as null values.
2014-05-08 13:33:55 +02:00
Andreas Fischer
8ede209ea3
Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that
...
Use strict type comparison
* owncloud/we-certainly-don't-want-type-juggling-on-that:
Use strict type comparison
2014-05-08 13:02:48 +02:00
Vincent Petry
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Bart Visscher
9f88141bcd
Use 'boolean' as type instead of 'bool'
2014-05-07 20:46:08 +02:00
Bart Visscher
f569c721a6
Merge branch 'master' into optimize-startup-queries
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
Lukas Reschke
c4109d9aef
Use strict type comparison
...
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
Lukas Reschke
254fa5eb22
Merge pull request #8488 from owncloud/sabre-notfoundloglevel
...
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 15:05:17 +02:00
Vincent Petry
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Vincent Petry
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
Vincent Petry
d16bb09aed
Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri
...
Send URI instead of filepath to NGINX for X-Accel
2014-05-06 18:41:06 +02:00
Bart Visscher
72864d1c53
Typo
2014-05-06 18:05:06 +02:00
Morris Jobke
9411ba2acd
Merge pull request #8459 from owncloud/fix-getUserFolder
...
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
Morris Jobke
91a5e728c0
fix getUserFolder() of server container
2014-05-05 18:15:48 +02:00
Robin Appelman
578eb33c20
Dont create borders around previews when scaling up is disabled
2014-05-05 14:54:34 +02:00
Vincent Petry
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
Thomas Müller
341fcdc37a
Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
...
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
Thomas Müller
d2754af7c3
Merge pull request #8442 from owncloud/fix-typo
...
Fix typo and PHPDoc
2014-05-05 10:03:47 +02:00
Jenkins for ownCloud
51d1e6c8b1
[tx-robot] updated from transifex
2014-05-05 01:55:47 -04:00
Lukas Reschke
0b7d9e2668
Cleanup code a little bit
...
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
2014-05-04 15:51:08 +02:00
Lukas Reschke
73b914ddbc
Add CSRF check on login and logout
...
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
2014-05-04 13:56:21 +02:00
Lukas Reschke
5cfc9d973d
Fix PHP Doc and use readable variable name
2014-05-04 13:02:58 +02:00
Lukas Reschke
6f57911b44
Does also take int or string
2014-05-04 13:01:57 +02:00
Lukas Reschke
d091cca636
Fix typo
2014-05-04 12:53:06 +02:00
Morris Jobke
623161b9a9
Merge pull request #8023 from flyser/master
...
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Bernhard Posselt
906061a07b
Merge pull request #8171 from owncloud/fix-import
...
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
Vincent Petry
9e18be6422
Merge pull request #8377 from youngguns-nl/issue_8376
...
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
Thomas Müller
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
Thomas Müller
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
Jenkins for ownCloud
6519b9672a
[tx-robot] updated from transifex
2014-05-02 01:55:53 -04:00
Jörn Friedrich Dreyer
6694129cbc
columns should be nullable by default
2014-05-01 23:03:45 +02:00
Bart Visscher
614cc67f88
Correct return type for getFilePath
2014-05-01 18:12:17 +02:00
Bart Visscher
c34659dd89
Better documentation for isValidSource function
2014-05-01 18:11:55 +02:00
Bart Visscher
50f49c57b5
Some more params are optional
2014-05-01 18:11:30 +02:00
Jenkins for ownCloud
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
Thomas Müller
11404b2b12
Merge pull request #8391 from owncloud/router-parameter-sorting
...
Preserve keys when sorting parameters when generatings urls
2014-04-30 15:10:36 +02:00
Thomas Müller
4481a8412c
Merge pull request #8132 from owncloud/issue/8131
...
Issue/8131 Fix emitting of filesystem related hooks
2014-04-30 13:57:44 +02:00
Jenkins for ownCloud
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
Robin Appelman
77e6278d09
Preserve keys when sorting parameters when generatings urls
2014-04-29 11:55:19 +02:00
icewind1991
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
Joas Schilling
c060f6ec7b
Deduplicate code
2014-04-29 10:34:28 +02:00
Joas Schilling
c1caaa6241
Correctly emit create/update hooks when a large file is being created/update
...
after being uploaded in .part files
Fix #8131
2014-04-29 10:34:27 +02:00
Joas Schilling
4fa9e46d2b
Emit a new hook, when a file is being updated only
...
The write-hook also is triggered for created files
Fix #8131
2014-04-29 10:34:26 +02:00
Jenkins for ownCloud
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
Thomas Müller
7c0340c63c
Merge pull request #7852 from josh4trunks/basic_auth_fix
...
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-28 21:46:52 +02:00
Thomas Müller
6935364b33
add class Pimple to autloader
2014-04-28 20:57:44 +02:00
Volkan Gezer
e7c6111ae3
Update outdated comment
2014-04-28 20:23:18 +02:00
Sjors van der Pluijm
e8a287f5bb
refs #8376 ; spaces=>tabs
2014-04-28 19:52:06 +02:00
Sjors van der Pluijm
54f482ff9c
refs #8376 ; added comment and applied patch on other files
2014-04-28 19:32:25 +02:00
Bart Visscher
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
Arthur Schiwon
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Sjors van der Pluijm
d7ec1fe447
rewind iterator before iteration starts
2014-04-28 13:05:20 +02:00
Georg Ehrke
b68098ebba
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 12:05:10 +02:00
Sjors van der Pluijm
d8be9d96ed
fixes #8376
2014-04-28 10:20:24 +02:00
Thomas Müller
5fd776debf
Merge pull request #7473 from owncloud/append-error-document
...
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
Jenkins for ownCloud
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
Lukas Reschke
e910e63140
Merge pull request #8372 from owncloud/give-admins-a-hint
...
Clarify the trusted_domain error page
2014-04-27 18:28:18 +02:00
Lukas Reschke
1d9ac38da6
Remove an added t by the github webeditor
...
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke
7a8bfeae6e
Grammatical fixes
2014-04-27 16:31:04 +02:00
Jenkins for ownCloud
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
Lukas Reschke
b6612ef04a
Clarify the trusted_domain error page
2014-04-26 23:11:29 +02:00
Bart Visscher
7c0370105a
Fix wrong var name
2014-04-26 11:15:09 +02:00
Bart Visscher
fc9371ae10
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
Jenkins for ownCloud
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
icewind1991
7599fa94ce
Merge pull request #8350 from owncloud/share-search-mime
...
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
icewind1991
5194f014c9
Merge pull request #7504 from owncloud/webdav-injection
...
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
Robin Appelman
194ea66cb5
Merge branch 'master' into share-search-mime
2014-04-25 14:04:41 +02:00
Robin Appelman
672a8248ce
Correct the path returned by getFolderContent for substorages
2014-04-25 13:56:45 +02:00
Robin Appelman
456ca0cf7d
fix paths of searchByMime results on substorages
2014-04-25 12:31:44 +02:00
Robin Appelman
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
Robin McCorkell
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
Jenkins for ownCloud
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
Lukas Reschke
1cafd1e3b9
Merge pull request #8337 from owncloud/flv-to-mimes
...
Add flv to known mimetypes
2014-04-24 19:09:01 +02:00
Björn Schießle
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
Victor Dubiniuk
fc4be3d0ad
Add flv to known mimetypes
2014-04-24 19:09:31 +03:00
Bjoern Schiessle
35321c7d41
add additional rows to the select statement, 'stime' is needed for the expire check
2014-04-24 15:18:25 +02:00
Bjoern Schiessle
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
Robin Appelman
cd0c5990f8
properly quote etags
2014-04-24 11:12:39 +02:00
Robin Appelman
49b44e7e22
Normalize paths when moving properties
2014-04-24 11:12:39 +02:00
Thomas Müller
8127e984bd
Merge pull request #8332 from owncloud/l10n-access-untrusted
...
This adds one more missing untranslated text from lib/share
2014-04-24 10:06:37 +02:00
Jenkins for ownCloud
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
Volkan Gezer
ff0dab6e92
This adds one more missing untranslated text from lib/share
...
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
Thomas Müller
4ba6f4839d
fixing typos and PHPDoc
2014-04-23 15:36:01 +02:00
Robin Appelman
e77d89fc4b
Revert changes to OC_Connector_Sabre_Server
2014-04-23 14:21:09 +02:00
icewind1991
c8801a41d8
Merge pull request #8324 from owncloud/expired-link-error
...
Fix error when viewing expired link
2014-04-23 14:13:44 +02:00
Bernhard Posselt
5199e4508a
dont update entity and dont run an update query if an entity wasnt changed at all
2014-04-23 13:43:17 +02:00
Bjoern Schiessle
b312d38d38
remove hard-coded shared folder
2014-04-23 12:59:22 +02:00
Bjoern Schiessle
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
dfb69e9418
allow user to delete shared files/folders
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
4c840cb61d
fix target generation for group shares
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
27c5a978f9
we no longer need to handle the Shared folder different from any other folder
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
Bjoern Schiessle
72bbb9ca20
allow to remove and change mount points
2014-04-23 12:54:24 +02:00
Bjoern Schiessle
cfc52ccc3d
add some action items
2014-04-23 12:54:24 +02:00
Robin Appelman
3d0661a1e7
Fix error when viewing expired link
2014-04-23 12:54:18 +02:00