]>
source.dussan.org Git - nextcloud-server.git/log
Bart Visscher [Mon, 31 Mar 2014 19:38:54 +0000 (21:38 +0200)]
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Morris Jobke [Mon, 31 Mar 2014 13:56:19 +0000 (15:56 +0200)]
Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
Jan-Christoph Borchardt [Mon, 31 Mar 2014 10:27:26 +0000 (12:27 +0200)]
fix duplicate rules for button/input styles, em to px
Vincent Petry [Mon, 31 Mar 2014 08:50:05 +0000 (10:50 +0200)]
Merge pull request #7939 from owncloud/wring_redirect_on_login
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Jenkins for ownCloud [Mon, 31 Mar 2014 05:55:43 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 30 Mar 2014 05:55:42 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Tanghus [Sat, 29 Mar 2014 19:40:49 +0000 (20:40 +0100)]
Sub-dir was prepended twice
Thomas Tanghus [Sat, 29 Mar 2014 19:39:55 +0000 (20:39 +0100)]
Sub-dir was prepended twice
Jenkins for ownCloud [Sat, 29 Mar 2014 05:55:44 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 28 Mar 2014 20:54:50 +0000 (21:54 +0100)]
Merge pull request #7845 from duritong/fix_submodule_url
use https as submodule url
Morris Jobke [Fri, 28 Mar 2014 20:20:09 +0000 (21:20 +0100)]
Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
adding @method annotation to declare methods which can be called on the ...
Thomas Tanghus [Fri, 28 Mar 2014 17:05:48 +0000 (18:05 +0100)]
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Vincent Petry [Fri, 28 Mar 2014 16:35:20 +0000 (17:35 +0100)]
Merge pull request #7934 from owncloud/addEventToExpirationDate
Emit event after setting a new expiration for a share
Morris Jobke [Fri, 28 Mar 2014 14:14:12 +0000 (15:14 +0100)]
Merge pull request #7770 from jamesryanbell/master
SVG support detection
Morris Jobke [Fri, 28 Mar 2014 14:00:13 +0000 (15:00 +0100)]
Emit event after setting a new expiration for a share
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
Björn Schießle [Fri, 28 Mar 2014 13:59:05 +0000 (14:59 +0100)]
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
don't write file if opening a stream to encrypt the data fails
Thomas Müller [Fri, 28 Mar 2014 12:06:07 +0000 (13:06 +0100)]
Merge pull request #7824 from owncloud/hash-parameter-order
Fix parameter order for Storage\Local::hash
Thomas Müller [Fri, 28 Mar 2014 11:57:27 +0000 (12:57 +0100)]
adding @method annotation to declare methods which can be called on the wrapped statement object
Vincent Petry [Fri, 28 Mar 2014 11:23:11 +0000 (12:23 +0100)]
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
sharing api cleanup, first step
Vincent Petry [Fri, 28 Mar 2014 11:12:49 +0000 (12:12 +0100)]
Merge pull request #7613 from owncloud/fix_urlGenerator2
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
Thomas Müller [Fri, 28 Mar 2014 11:07:44 +0000 (12:07 +0100)]
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
Squashed commit of the following:
commit
eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge:
1e9c5be 1e7d7bd
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Mar 28 11:49:04 2014 +0100
Merge branch 'master' of https://github.com/kev300/core into kev300-master
commit
1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:11:42 2013 +0100
Update util.php
commit
3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:09:15 2013 +0100
Update util.php
commit
512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:02:04 2013 +0100
Update util.php
commit
6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date: Mon Dec 16 16:44:46 2013 +0100
Update util.php
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
Vincent Petry [Fri, 28 Mar 2014 11:08:38 +0000 (12:08 +0100)]
Merge pull request #7829 from owncloud/cachefolderlocation
Cache folder is now configurable
Bjoern Schiessle [Fri, 28 Mar 2014 11:02:49 +0000 (12:02 +0100)]
don't write file if opening a stream to encrypt the data fails
Thomas Müller [Fri, 28 Mar 2014 10:41:21 +0000 (11:41 +0100)]
Merge pull request #7703 from rnveach/jstest
Fixing issues found with running 'autotest-js' locally
Vincent Petry [Fri, 28 Mar 2014 10:33:57 +0000 (11:33 +0100)]
Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
Cleanup the fileproxy proxies on test bootstrap
Björn Schießle [Fri, 28 Mar 2014 10:22:19 +0000 (11:22 +0100)]
Merge pull request #7872 from owncloud/trash-disablestoragestats
Do not retrieve storage stats for trash bin
Vincent Petry [Tue, 25 Mar 2014 10:00:01 +0000 (11:00 +0100)]
Do not retrieve storage stats for trash bin
Robin McCorkell [Fri, 28 Mar 2014 10:02:28 +0000 (10:02 +0000)]
Merge pull request #7842 from Xenopathic/files_external_config_optional
Enable the use of 'optional' on password fields for mount configuration
Vincent Petry [Fri, 28 Mar 2014 09:41:46 +0000 (10:41 +0100)]
Merge pull request #7720 from ideaship/autoconfig_fix
fix autoconfig
Thomas Müller [Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)]
Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
Thomas Müller [Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)]
Merge pull request #7724 from owncloud/mobile
[WIP] Mobile optimization for base layout and Files app
Jenkins for ownCloud [Fri, 28 Mar 2014 05:55:47 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Wed, 26 Mar 2014 16:48:33 +0000 (17:48 +0100)]
prevent dimmed ocdialog div from scrolling
Morris Jobke [Fri, 28 Mar 2014 01:29:35 +0000 (02:29 +0100)]
Merge pull request #7913 from owncloud/fix-logo
fix SVG replacement for logo so it works in IE8, fix #7866
Morris Jobke [Thu, 27 Mar 2014 22:53:19 +0000 (23:53 +0100)]
fix breadcrumbs for IE8
Vincent Petry [Thu, 27 Mar 2014 17:10:45 +0000 (18:10 +0100)]
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
Fix swift touch operation
Jan-Christoph Borchardt [Thu, 27 Mar 2014 16:13:36 +0000 (17:13 +0100)]
convert input metrics to px
Jan-Christoph Borchardt [Thu, 27 Mar 2014 16:13:12 +0000 (17:13 +0100)]
remove additional radio button width declaration
Jan-Christoph Borchardt [Thu, 27 Mar 2014 13:48:54 +0000 (14:48 +0100)]
enable SVG->PNG fallback for 'New' menu
Jan-Christoph Borchardt [Thu, 27 Mar 2014 13:48:35 +0000 (14:48 +0100)]
enable SVG->PNG fallback for newly uploaded files and folders
Jan-Christoph Borchardt [Thu, 27 Mar 2014 13:37:41 +0000 (14:37 +0100)]
specify logo to not repeat when container is bigger
Jan-Christoph Borchardt [Thu, 27 Mar 2014 13:31:24 +0000 (14:31 +0100)]
fix SVG replacement for logo so it works in IE8, fix #7866
Vincent Petry [Thu, 27 Mar 2014 11:34:30 +0000 (12:34 +0100)]
Fix swift touch operation
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.
This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
Vincent Petry [Thu, 27 Mar 2014 11:18:51 +0000 (12:18 +0100)]
Merge pull request #7875 from Xenopathic/files_external_smb_auto
SMB/CIFS mounts using ownCloud login, fixes #7843
Vincent Petry [Thu, 27 Mar 2014 08:31:37 +0000 (09:31 +0100)]
Merge pull request #7898 from owncloud/ext-swiftmtime
Fixed mtime reading from OpenStack API
Vincent Petry [Thu, 27 Mar 2014 08:31:17 +0000 (09:31 +0100)]
Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix
Use the correct resolve method to resolve file storage (x-sendfile)
Jenkins for ownCloud [Thu, 27 Mar 2014 05:56:30 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Wed, 26 Mar 2014 17:14:35 +0000 (18:14 +0100)]
Use the correct resolve method to resolve file storage
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.
It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
Vincent Petry [Wed, 26 Mar 2014 16:20:40 +0000 (17:20 +0100)]
Fixed mtime reading from OpenStack API
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
Thomas Müller [Wed, 26 Mar 2014 15:48:54 +0000 (16:48 +0100)]
Merge pull request #7893 from owncloud/no-routed-link-for-css-files
css files are not to be routed through index.php anymore
Thomas Müller [Wed, 26 Mar 2014 15:47:24 +0000 (16:47 +0100)]
Merge pull request #7896 from Xenopathic/misc_text_fixes
Miscellaneous text fixes for core apps
Robin McCorkell [Wed, 26 Mar 2014 15:43:03 +0000 (15:43 +0000)]
Miscellaneous text fixes for core apps
Jan-Christoph Borchardt [Wed, 26 Mar 2014 15:32:09 +0000 (16:32 +0100)]
change mobile breakpoint for shared view to 768px as well
Robin McCorkell [Wed, 26 Mar 2014 15:11:09 +0000 (15:11 +0000)]
Use braces on single line if statements
Vincent Petry [Wed, 26 Mar 2014 14:52:31 +0000 (15:52 +0100)]
Merge pull request #7889 from owncloud/routing-warning
Fix undefined index warning in router
Robin McCorkell [Wed, 26 Mar 2014 11:22:47 +0000 (11:22 +0000)]
Fix error in $isPersonal setting
Thomas Müller [Wed, 26 Mar 2014 14:36:55 +0000 (15:36 +0100)]
css files are not to be routed through index.php anymore
Robin McCorkell [Wed, 26 Mar 2014 11:04:13 +0000 (11:04 +0000)]
Perform proper checking for share availability
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.
The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
Robin McCorkell [Tue, 25 Mar 2014 13:54:54 +0000 (13:54 +0000)]
Rename SMB_Auto to SMB_OC and change visible name
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
Robin McCorkell [Mon, 24 Mar 2014 15:15:15 +0000 (15:15 +0000)]
Revoke sharable permission on automatic SMB shares
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
Robin McCorkell [Mon, 24 Mar 2014 15:05:14 +0000 (15:05 +0000)]
Use loginname instead of display name
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
Robin McCorkell [Fri, 21 Mar 2014 14:22:48 +0000 (14:22 +0000)]
SMB/CIFS mount using OwnCloud logon credentials
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.
Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
Vincent Petry [Wed, 26 Mar 2014 13:30:35 +0000 (14:30 +0100)]
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
Fix merging of external storage configurations
Vincent Petry [Wed, 26 Mar 2014 12:34:31 +0000 (13:34 +0100)]
Merge pull request #7885 from owncloud/extstorage-prettyprintjson
Pretty print mount.json when possible
Robin Appelman [Wed, 26 Mar 2014 12:02:11 +0000 (13:02 +0100)]
fix undefined index warning in router
Vincent Petry [Wed, 26 Mar 2014 11:10:17 +0000 (12:10 +0100)]
Fix merging of external storage configurations
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
Vincent Petry [Wed, 26 Mar 2014 10:29:04 +0000 (11:29 +0100)]
Pretty print mount.json when possible
Vincent Petry [Wed, 26 Mar 2014 08:39:09 +0000 (09:39 +0100)]
Remove unused setUserVars utility method
That method was moved to the external storage recently so
isn't needed here any more.
Jenkins for ownCloud [Wed, 26 Mar 2014 05:56:21 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 25 Mar 2014 23:14:38 +0000 (00:14 +0100)]
adding ellipsis on file names to public file list as well
Thomas Müller [Tue, 25 Mar 2014 23:04:11 +0000 (00:04 +0100)]
adding proper notification area for multi line messages
Thomas Müller [Tue, 25 Mar 2014 22:40:40 +0000 (23:40 +0100)]
adding ellipsis on file names
Thomas Müller [Tue, 25 Mar 2014 22:35:55 +0000 (23:35 +0100)]
use minimum-scale=1.0
Thomas Müller [Tue, 25 Mar 2014 22:17:18 +0000 (23:17 +0100)]
Merge pull request #7748 from owncloud/postgresversionwarning
Added PostgreSQL version warning on upgrade
Thomas Müller [Tue, 25 Mar 2014 22:17:00 +0000 (23:17 +0100)]
fixing code style
Thomas Müller [Tue, 25 Mar 2014 22:00:36 +0000 (23:00 +0100)]
Merge pull request #7864 from owncloud/routing-performance
Routing performance
Thomas Müller [Tue, 25 Mar 2014 21:59:42 +0000 (22:59 +0100)]
update type hint in PHPDoc
Thomas Müller [Tue, 25 Mar 2014 21:45:14 +0000 (22:45 +0100)]
Merge pull request #7325 from owncloud/recursive-mkdir-local
Recursive mkdir fixes #7047
Thomas Müller [Tue, 25 Mar 2014 21:41:09 +0000 (22:41 +0100)]
Merge pull request #7420 from owncloud/cachehooks-first
Manually triger the filecache update hooks before any other hook
Thomas Müller [Tue, 25 Mar 2014 21:33:24 +0000 (22:33 +0100)]
Merge pull request #7477 from owncloud/foldersize-reuse
Allow re-using already known fileinfo when calculating folder sizes
VicDeo [Tue, 25 Mar 2014 18:29:26 +0000 (20:29 +0200)]
Merge pull request #7772 from owncloud/filter_more_jsconsole
Also replace console.time/timeEnd when not in DEBUG mode
Vincent Petry [Tue, 25 Mar 2014 18:17:36 +0000 (19:17 +0100)]
Merge pull request #7689 from owncloud/last_cron_log
Log last cron execution
Bjoern Schiessle [Wed, 12 Mar 2014 10:00:30 +0000 (11:00 +0100)]
finally fix the paths for the OCS Share API
Bjoern Schiessle [Tue, 11 Mar 2014 11:58:46 +0000 (12:58 +0100)]
fix path creation for re-shares, issue #7662
Bjoern Schiessle [Fri, 7 Mar 2014 14:38:14 +0000 (15:38 +0100)]
don't assign variables in if condition
Bjoern Schiessle [Thu, 6 Mar 2014 14:30:01 +0000 (15:30 +0100)]
add todo
Bjoern Schiessle [Thu, 6 Mar 2014 13:00:12 +0000 (14:00 +0100)]
always return an array
Bjoern Schiessle [Mon, 3 Mar 2014 16:30:16 +0000 (17:30 +0100)]
seperate formatResults()
Bjoern Schiessle [Mon, 3 Mar 2014 16:27:26 +0000 (17:27 +0100)]
don't assign variables in if conditions
Bjoern Schiessle [Mon, 3 Mar 2014 16:24:31 +0000 (17:24 +0100)]
use variable
Bjoern Schiessle [Mon, 3 Mar 2014 16:20:09 +0000 (17:20 +0100)]
seperate transformDBResults
Bjoern Schiessle [Mon, 3 Mar 2014 16:06:45 +0000 (17:06 +0100)]
seperate creation of select statement
Bjoern Schiessle [Tue, 18 Feb 2014 15:32:49 +0000 (16:32 +0100)]
remove prepFileTarget() seems that it is no longer in use
Bjoern Schiessle [Tue, 18 Feb 2014 14:07:03 +0000 (15:07 +0100)]
add a "helper" and a "hooks" class. Move constants needed by multiple classes
to a "constants" class
Bjoern Schiessle [Tue, 18 Feb 2014 11:37:32 +0000 (12:37 +0100)]
added private share api
Thomas Müller [Tue, 25 Mar 2014 16:46:05 +0000 (17:46 +0100)]
call OC_App::loadApps(); to load all commands of all apps and related functionality
Thomas Müller [Tue, 25 Mar 2014 16:42:41 +0000 (17:42 +0100)]
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
Robin Appelman [Tue, 25 Mar 2014 13:28:30 +0000 (14:28 +0100)]
Fix routes getting lost when loading app routes twice
Robin Appelman [Tue, 25 Mar 2014 13:04:18 +0000 (14:04 +0100)]
fix incorect array
Robin Appelman [Tue, 25 Mar 2014 12:42:47 +0000 (13:42 +0100)]
Only load core routes for ocs and settings