Frank Karlitschek
1d0af242b9
Merge pull request #6436 from owncloud/allconfig-defaults
...
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
2013-12-17 05:09:58 -08:00
Jenkins for ownCloud
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
Thomas Müller
275d666d26
Merge pull request #6438 from owncloud/core-logexceptionfix
...
Do not use L10n when logging exceptions
2013-12-17 00:53:03 -08:00
Andreas Fischer
dfeb04a574
Do not use xcache variable cache if cache size is 0.
...
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
2013-12-17 02:40:16 +01:00
Thomas Tanghus
a3fbad43c1
Use DEBUG instead of ERROR when favourites not found. Fix #6419
2013-12-16 17:07:22 +01:00
Vincent Petry
2a1d6d3106
Do not use L10n when logging exceptions
...
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
2013-12-16 15:11:13 +01:00
icewind1991
fed63dff06
Merge pull request #6315 from owncloud/ingroup-cache
...
cache the result from inGroup
2013-12-16 06:01:00 -08:00
Robin Appelman
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
Robin Appelman
59f02066b6
add default parameter for AllConfig->get*Value()
2013-12-16 14:30:01 +01:00
Andreas Fischer
c205d8d1c9
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
...
* owncloud/master: (1989 commits)
[tx-robot] updated from transifex
dont try to register background jobs if we haven't upgraded yet
adjust test
coding style
coding style
On webdav sesssions, loginname was compared to username which does not need to match necessarily
rely only on php DateTime to parse the db datetime string
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
Fix webroot for update page
Update 3rdparty ref
update 3rdparty
toggle select all checkbox
remove unneeded ; in comment
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
Add test for having utf8 filenames in the cache
fix fallback overwriting result of getHome
[tx-robot] updated from transifex
fix smbclient directory listing parser
cache the home folder of a User
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
...
Conflicts:
lib/util.php
2013-12-14 18:32:48 +01:00
Jenkins for ownCloud
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
Robin Appelman
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
Arthur Schiwon
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
Arthur Schiwon
dcfda5c2a9
coding style
2013-12-13 16:58:09 +01:00
Arthur Schiwon
91d6a6dd7c
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-13 16:58:03 +01:00
Jörn Friedrich Dreyer
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
Vincent Petry
ad998c1fb5
Merge pull request #6390 from owncloud/migration-fixwebroot
...
Fix webroot for update page
2013-12-13 05:35:29 -08:00
Vincent Petry
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Thomas Müller
7b30ffbf23
Merge pull request #6318 from owncloud/gethome-cache
...
cache the home folder of a User
2013-12-13 01:30:43 -08:00
Robin Appelman
8a86837eac
remove unneeded ; in comment
2013-12-12 13:59:00 +01:00
Robin Appelman
f23b7a262f
fix fallback overwriting result of getHome
2013-12-12 12:57:25 +01:00
Vincent Petry
335b2f40a6
Fixed download file from URL error messages
...
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
2013-12-12 10:38:12 +01:00
Robin Appelman
3d29992378
user Group->users as assosiative array
2013-12-11 16:25:41 +01:00
Robin Appelman
366d75e947
cache the home folder of a User
2013-12-11 16:22:26 +01:00
Robin Appelman
b126374780
cache the result from inGroup
2013-12-11 15:47:36 +01:00
Robin Appelman
5c7a08aab4
check if a $_SESSION entry exists before we try to remove it
2013-12-11 12:59:48 +01:00
Andreas Fischer
cdd182ce35
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-11 00:19:51 +01:00
Vincent Petry
82bf1f9c8c
Added workaround for Android content disposition
...
Fixes #5807
2013-12-10 12:42:41 +01:00
Vincent Petry
409b510889
Moved content disposition code+workarounds to OCP\Response
...
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Joas Schilling
009e25788f
correctly mark app management active
2013-12-09 15:53:31 +01:00
Jenkins for ownCloud
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
Robin Appelman
a36bf5c2b5
preserve 3rd party values in in the Session destructor
2013-12-09 12:38:27 +01:00
blizzz
bc3650e48c
Merge pull request #6231 from owncloud/fix-plural-l10n
...
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Morris Jobke
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
blizzz
6a747106db
Merge pull request #6150 from owncloud/backgroundjob-log-exception
...
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
Vincent Petry
123bc9921a
Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
...
reuse etags when doing a background scan
2013-12-06 10:13:14 -08:00
Robin Appelman
9eca2471b3
Merge branch 'master' into backgroundscan-reuse-etag
2013-12-06 18:27:46 +01:00
Bart Visscher
4c8bc61753
XSendfile and encryption don't work together
...
The file on disk is encrypted, and not readable on client systems
2013-12-06 17:59:59 +01:00
Bart Visscher
6aa9daf4e6
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 15:51:49 +01:00
Björn Schießle
b18c8e5c53
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
...
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
Morris Jobke
9c4bbf9ad7
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
...
This reverts commit eba35d28cd
.
2013-12-05 20:53:11 +01:00
Bjoern Schiessle
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +01:00
Morris Jobke
eba35d28cd
Revert "Fix user's displayName being overwritten by (old) cookie"
...
This reverts commit 2a7380cc21
.
2013-12-05 16:12:46 +01:00
Robin Appelman
01ab15a2b0
reuse etags when doing a background scan
2013-12-05 15:23:34 +01:00
Nico Kaiser
2a7380cc21
Fix user's displayName being overwritten by (old) cookie
2013-12-05 14:18:32 +01:00
Jenkins for ownCloud
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
Alexander Bergolth
301d469813
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-04 18:01:51 +01:00
Morris Jobke
d73875b2b4
Merge pull request #6169 from owncloud/php_version_warning
...
PHP version warning
2013-12-04 01:49:54 -08:00
Frank Karlitschek
61296ed7bb
lower required php version to 5.3.3
2013-12-04 10:25:22 +01:00
Frank Karlitschek
8fdbb98899
Merge pull request #6168 from owncloud/extstorage-testtestmethod
...
Added unit test for the test() method of ext storage
2013-12-03 11:00:49 -08:00
Thomas Müller
16eb7c15d2
Merge pull request #6076 from owncloud/fix-6073-master
...
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 08:21:45 -08:00
Vincent Petry
6cf9844e9c
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
Frank Karlitschek
b83e891456
Merge pull request #5929 from owncloud/code_check_on
...
switch code checker on by default. apps are not allowed to access
2013-12-03 01:14:35 -08:00
Thomas Müller
a999350f69
Merge pull request #6158 from owncloud/rmdir-check
...
check if a directory exists before we try to remove it
2013-12-02 15:14:41 -08:00
Jenkins for ownCloud
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
Robin Appelman
64bfcbee0a
check if a directory exists before we try to remove it
2013-12-02 22:44:28 +01:00
Robin Appelman
4f4ad72460
remove background jobs if they are failing
2013-12-02 13:43:26 +01:00
Robin Appelman
35bb6f7e3a
Catch exceptions from background jobs and log them
2013-12-02 13:41:47 +01:00
Thomas Mueller
87e795a693
fixing PHPDoc and spelling
2013-12-02 08:42:28 +01:00
Thomas Müller
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
Frank Karlitschek
3c62de90fd
Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble
...
Fixed touch after chunk assembling
2013-11-29 09:19:51 -08:00
Vincent Petry
80d2371f97
Fixed touch after chunk assembling
...
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.
Fixes #6007
2013-11-29 16:29:35 +01:00
Frank Karlitschek
7ca0de9bd3
make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
...
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
2013-11-29 15:46:10 +01:00
Frank Karlitschek
a03ba06dcd
Merge pull request #6077 from owncloud/fix-api-documentation
...
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
Morris Jobke
41a1a32e5a
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
...
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Morris Jobke
0cbe9d79ba
Merge pull request #6106 from owncloud/fix_preview_creation
...
Fix preview creation
2013-11-28 12:48:19 -08:00
Bjoern Schiessle
466ed01e5d
correctFolder() already resolves the dirname internally
2013-11-28 19:25:49 +01:00
Bjoern Schiessle
bdfef554c4
add PHPDoc for setMimetype()
2013-11-28 19:05:43 +01:00
Bjoern Schiessle
eeb31420fe
we need to be able to set the mimetype manually
2013-11-28 18:52:58 +01:00
Bjoern Schiessle
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
Frank Karlitschek
dab3629ff5
Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
...
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
Andreas Fischer
93b0bd0a9e
Use getLastError() everywhere.
2013-11-28 12:05:46 +01:00
Andreas Fischer
904573d0d0
Add getLastError()
2013-11-28 12:04:28 +01:00
Andreas Fischer
955127231a
No function as oci_last_error. It's oci_error.
2013-11-28 11:37:29 +01:00
Andreas Fischer
fcf332abbf
There is no property such as dbusername. It's 'dbuser'.
2013-11-28 11:33:49 +01:00
Andreas Fischer
b90f88f939
Correct property name. It's 'dbpassword', with the 'db' prefix.
2013-11-28 11:33:43 +01:00
Andreas Fischer
005c98e46c
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-11-28 11:23:45 +01:00
Frank Karlitschek
d2567129a1
Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6
...
on mssql the schema migration sometimes fails due to an already existing...
2013-11-28 02:16:16 -08:00
Thomas Müller
f23d641b82
Merge pull request #6084 from owncloud/fix-app-routing
...
fix custom routes defined by apps
2013-11-28 00:00:09 -08:00
Vincent Petry
43b1cf7988
Redetect mime type whenever extension is renamed
2013-11-27 21:34:51 +01:00
Robin Appelman
885d04bc86
Fix getRawPathInfo for the '/' edge case
2013-11-27 21:28:54 +01:00
Morris Jobke
39f9e16f20
Merge pull request #6086 from owncloud/incognito_mode
...
return false if user is in incognito mode
2013-11-27 09:11:18 -08:00
Jenkins for ownCloud
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
Bjoern Schiessle
6deda1b9f6
return false if user is in incognito mode
2013-11-27 16:52:30 +01:00
Robin Appelman
c47e46fda0
fix custom routes defined by apps
2013-11-27 15:35:49 +01:00
Morris Jobke
a81909097c
Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
...
fix appframework routing
2013-11-27 01:55:52 -08:00
Morris Jobke
7755e69af0
add PHPDoc for urlParams
2013-11-27 10:55:06 +01:00
Morris Jobke
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
Morris Jobke
7c88736292
API doc for contacts manager, server container and share
2013-11-27 00:35:36 +01:00
Thomas Mueller
4fbc2774ef
on mssql the schema migration sometimes fails due to an already existing transaction - error: 'New transaction is not allowed because there are other threads running in the session.'
...
The solution is to simple reconnect to the database to start with a fresh connection
2013-11-26 22:39:01 +01:00
blizzz
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Björn Schießle
1fef97f6a5
Merge pull request #6060 from owncloud/fix-6050-oc6
...
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
Thomas Müller
52941341fd
fixing failing unit test
2013-11-26 16:52:33 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Thomas Müller
2a93720f3f
fixes #6050
2013-11-26 14:13:33 +01:00
Robin Appelman
10d84f6e9b
Add a (currently) empty system for running common repair steps
2013-11-26 14:12:48 +01:00
Bjoern Schiessle
62afe7fe7a
remove passwords from logfile
2013-11-26 12:26:32 +01:00
Andreas Fischer
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
Andreas Fischer
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00
Jenkins for ownCloud
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
Robin Appelman
9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
Owen Winkler
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
Jörn Friedrich Dreyer
4b67d4258d
Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6
...
Fixing rawpath reverseproxy oc6
2013-11-25 08:21:33 -08:00
Thomas Müller
a42d152ac3
Merge pull request #6037 from owncloud/fix-6007-oc6
...
adding chunked upload handling
2013-11-25 08:16:45 -08:00
Thomas Müller
1fdd2ac7ee
adding documentation for registerRoutes()
2013-11-25 17:15:08 +01:00
Morris Jobke
b3e7e54c8d
fix some capital letters
2013-11-25 16:42:28 +01:00
Morris Jobke
4e0fa85307
page level doc blocks and class descriptions
2013-11-25 16:39:01 +01:00
Morris Jobke
bc8cc9142e
AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes
2013-11-25 16:28:24 +01:00
Thomas Müller
27cc333dfe
adding chunked upload handling
2013-11-25 15:35:26 +01:00
Robin Appelman
71c1327691
Add "single user mode" which restricts access to users in the admin group
...
This can be enabled by setting 'singleuser' to true in config.php
2013-11-25 15:08:24 +01:00
Thomas Müller
b9fed935b4
in case uri and script name don't match we better throw an exception
2013-11-25 14:42:34 +01:00
Morris Jobke
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
Thomas Müller
a0a665ea45
handle duplicate slashes in case of reverse proxy configuration
2013-11-25 14:21:51 +01:00
Morris Jobke
7f47cc062c
fix defaults.php doc
2013-11-25 14:13:58 +01:00
Morris Jobke
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
Robin Appelman
317d421874
provide more cli friendly error messages
2013-11-25 13:04:23 +01:00
Simon Könnecke
243f3f0c4c
No decimal points for Kilobyte and Byte #5371 .
2013-11-25 12:26:03 +01:00
Thomas Müller
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01:00
Thomas Müller
1a69079139
Merge pull request #6021 from owncloud/show_build
...
Show build number
2013-11-24 15:01:11 -08:00
Thomas Müller
a2d4cd87d0
Merge pull request #5874 from owncloud/fix-5845
...
Fix file uploads on Windows with SQL Server
2013-11-24 14:15:17 -08:00
Thomas Mueller
228f1788fa
add new function to generate the human readable version string based on version, channel and build number
2013-11-24 21:26:34 +01:00
Thomas Mueller
6229f457d0
update PHPDoc
2013-11-24 21:18:14 +01:00
Frank Karlitschek
a11192bab3
send the build number too to push the next daily build. This is needed for the new daily build update channel
2013-11-24 16:45:06 +01:00
Frank Karlitschek
2ce850f7db
fix overwrite host support and make the code a bit more readable
2013-11-24 12:41:09 +01:00
Vincent Petry
aef34618de
Merge pull request #5995 from owncloud/extstorage-isreadablefix
...
Return plausible isReadable() default impl for ext storage
2013-11-24 03:04:33 -08:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Arthur Schiwon
6085878966
Avatar: accept OC_Image as in setParameter
2013-11-22 23:57:23 +01:00
Vincent Petry
c62cce8269
Moved default isReadable/isUpdatable impl into Common class
...
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
Bjoern Schiessle
aeefe48cba
Revert "use relative paths to create images from a file. This way it also works if"
...
This reverts commit 3488f0b77a
.
2013-11-22 18:01:44 +01:00
Vincent Petry
3b904647b0
Merge pull request #6003 from owncloud/incognito_mode
...
Incognito mode
2013-11-22 06:08:49 -08:00
Bjoern Schiessle
7e4f50d4e3
add incognito mode, allows to hide my user ID. For example, this is useful to access public resources while a user is still logged in
2013-11-22 13:55:38 +01:00
Thomas Müller
c05177b25b
Merge pull request #5882 from owncloud/preview-movie-5s
...
Movie preview - use frame after 5 seconds
2013-11-22 04:27:34 -08:00
Arthur Schiwon
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01:00
Raghu Nayyar
c503588827
Merge pull request #6000 from owncloud/use_relative_path_to_create_images
...
use relative paths to create images from a file.
2013-11-22 03:52:40 -08:00
blizzz
2f73db12bb
Merge pull request #5040 from owncloud/public_api_avatar_master
...
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
Thomas Müller
92c8672c0f
fixing PHPDoc comments and syntax
2013-11-22 12:34:37 +01:00
Bjoern Schiessle
3488f0b77a
use relative paths to create images from a file. This way it also works if
...
no user is logged in (e.g. public gallery share)
2013-11-22 12:26:01 +01:00
Thomas Müller
14e7075030
we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
...
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00
Thomas Müller
c22019dec5
Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that
2013-11-22 12:20:06 +01:00
Jenkins for ownCloud
60cfdae503
[tx-robot] updated from transifex
2013-11-21 21:07:12 -05:00
Arthur Schiwon
f94a6eb166
Add missing Avatar Interface
2013-11-22 00:43:23 +01:00
Arthur Schiwon
00071401d7
Round out Avatar Public API
2013-11-21 23:40:25 +01:00
Thomas Müller
4a2f9636cf
Merge pull request #5773 from owncloud/fix-2152-master
...
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
Jenkins for ownCloud
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
Vincent Petry
d0265f3388
Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
...
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
Thomas Müller
cd1cf58875
Fixing the warning notifications
2013-11-21 14:44:25 +01:00
Vincent Petry
69e8e7dbd5
Now using the "Home" storage detection approach for quota
...
To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
2013-11-21 12:17:47 +01:00