]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Mon, 17 Nov 2014 12:10:15 +0000 (13:10 +0100)]
Remove phpass and migrate to new Hasher interface
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
Jenkins for ownCloud [Mon, 17 Nov 2014 06:54:33 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 16 Nov 2014 06:55:00 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 15 Nov 2014 15:50:15 +0000 (16:50 +0100)]
Merge pull request #12186 from owncloud/fix-12182
eliminate OC_Template::printErrorPage in database classes, fixes #12182
Morris Jobke [Sat, 15 Nov 2014 12:38:18 +0000 (13:38 +0100)]
Merge pull request #12189 from owncloud/checkIfAppIsEnabled
Check if app is enabled for user
Lukas Reschke [Fri, 14 Nov 2014 16:20:51 +0000 (17:20 +0100)]
Check if app is enabled for user
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
Jenkins for ownCloud [Sat, 15 Nov 2014 06:54:28 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Clark Tomlinson [Fri, 14 Nov 2014 19:44:34 +0000 (14:44 -0500)]
Merge pull request #11029 from owncloud/fix-share-download
Fix share download
Arthur Schiwon [Fri, 14 Nov 2014 16:13:51 +0000 (17:13 +0100)]
do not output DB information, and do not set header
Arthur Schiwon [Fri, 14 Nov 2014 15:59:54 +0000 (16:59 +0100)]
errors are already logged
Vincent Cloutier [Thu, 16 Oct 2014 00:59:07 +0000 (20:59 -0400)]
Added download size on public sharing
Lukas Reschke [Wed, 15 Oct 2014 09:58:44 +0000 (11:58 +0200)]
Refactor file sharing public link handling
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
Arthur Schiwon [Fri, 14 Nov 2014 14:48:55 +0000 (15:48 +0100)]
eliminate OC_Template::printErrorPage in database classes, fixes #12182
Thomas Müller [Fri, 14 Nov 2014 13:38:13 +0000 (14:38 +0100)]
Merge pull request #12181 from owncloud/resubmit-second-fail
Fail...
Lukas Reschke [Fri, 14 Nov 2014 12:42:13 +0000 (13:42 +0100)]
Fail...
Thomas Müller [Fri, 14 Nov 2014 12:24:15 +0000 (13:24 +0100)]
Merge pull request #12177 from owncloud/skip-mail-test-for
Mark skipped until #12085 is merged
Lukas Reschke [Fri, 14 Nov 2014 12:19:02 +0000 (13:19 +0100)]
Mark skipped until #12085 is merged
See https://github.com/owncloud/core/pull/12175#issuecomment-
63054620
Jörn Friedrich Dreyer [Fri, 14 Nov 2014 09:37:10 +0000 (10:37 +0100)]
Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
Do not remove dir entry if it has the same name as the parent
Jenkins for ownCloud [Fri, 14 Nov 2014 06:54:47 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 13 Nov 2014 21:39:40 +0000 (22:39 +0100)]
Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup
cleanup group admin(s) on deleteGroup
Vincent Petry [Thu, 13 Nov 2014 16:37:56 +0000 (17:37 +0100)]
Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
Vincent Petry [Thu, 13 Nov 2014 15:35:01 +0000 (16:35 +0100)]
Merge pull request #12157 from owncloud/fix-autotest-condition
this allows a non-existant config/config.php for starting the autotest.s...
Morris Jobke [Thu, 13 Nov 2014 15:03:11 +0000 (16:03 +0100)]
Merge pull request #12158 from owncloud/drop-snapjs
remove unneeded snap.js - followup to #11985 - ref #12156
Morris Jobke [Thu, 13 Nov 2014 14:39:07 +0000 (15:39 +0100)]
Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name
removal of wrong/double implemented check
blizzz [Thu, 13 Nov 2014 13:43:06 +0000 (14:43 +0100)]
Merge pull request #12005 from owncloud/bower-multiselect
Move multiselect to user_ldap
Morris Jobke [Thu, 13 Nov 2014 12:20:37 +0000 (13:20 +0100)]
remove unneeded snap.js - followup to #11985 - ref #12156
michag86 [Tue, 4 Nov 2014 20:18:50 +0000 (21:18 +0100)]
removal of wrong/double implemented check
Check already implemented in core/settings/ajax/changedisplayname.php
Lukas Reschke [Tue, 11 Nov 2014 16:26:08 +0000 (17:26 +0100)]
Run preupdate before an update
The update routine tries to test the database migration before actually performing the update.
However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.
This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
Morris Jobke [Thu, 13 Nov 2014 10:58:09 +0000 (11:58 +0100)]
this allows a non-existant config/config.php for starting the autotest.sh
Vincent Petry [Thu, 13 Nov 2014 10:16:08 +0000 (11:16 +0100)]
Merge pull request #9177 from owncloud/jsdocexperiment
Improved JS Docs + added build script for JS Docs
Jenkins for ownCloud [Thu, 13 Nov 2014 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 6 Nov 2014 14:48:34 +0000 (15:48 +0100)]
Migrate multiselect to user_ldap
Morris Jobke [Wed, 12 Nov 2014 20:20:52 +0000 (21:20 +0100)]
Merge pull request #12141 from owncloud/kill-dav-client
OC_DAVClient is not longer used - no need to carry it around anymore
Vincent Petry [Wed, 12 Nov 2014 17:24:57 +0000 (18:24 +0100)]
Merge pull request #12087 from AdamWill/google-touch
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
Thomas Müller [Wed, 12 Nov 2014 16:29:56 +0000 (17:29 +0100)]
Merge pull request #12139 from owncloud/DoNotTouchMe
Try to read the file only instead of trying to touch
Thomas Müller [Wed, 12 Nov 2014 16:07:34 +0000 (17:07 +0100)]
OC_DAVClient is not longer used - no need to carry it around anymore
Jan-Christoph Borchardt [Wed, 12 Nov 2014 15:23:19 +0000 (16:23 +0100)]
Merge pull request #12128 from owncloud/drop-formfactor
Drop form_factor that is appended to JS, CSS and template filenames
Lukas Reschke [Wed, 12 Nov 2014 15:11:28 +0000 (16:11 +0100)]
Merge pull request #12126 from owncloud/remove-debug-statement
Remove debug statement
Lukas Reschke [Wed, 12 Nov 2014 14:56:02 +0000 (15:56 +0100)]
Try to read the file only instead of trying to touch
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.
Fixes https://github.com/owncloud/core/issues/12135
Morris Jobke [Wed, 12 Nov 2014 11:37:50 +0000 (12:37 +0100)]
Drop form_factor that is appended to JS, CSS and template filenames
Lukas Reschke [Wed, 12 Nov 2014 10:32:48 +0000 (11:32 +0100)]
Remove debug statement
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
Thomas Müller [Wed, 12 Nov 2014 10:25:42 +0000 (11:25 +0100)]
Merge pull request #12110 from owncloud/fix-12080
add 'namespace' for automatically created navigation divs, fixes #12080
Morris Jobke [Wed, 12 Nov 2014 09:59:41 +0000 (10:59 +0100)]
Merge pull request #12093 from AdamWill/storage-test-touch
storage test: use new file for testTouchCreateFile()
Arthur Schiwon [Tue, 11 Nov 2014 17:26:42 +0000 (18:26 +0100)]
add 'namespace' for automatically created navigation divs, fixes #12080
Thomas Müller [Wed, 12 Nov 2014 08:16:55 +0000 (09:16 +0100)]
Merge pull request #12105 from owncloud/dav-fixcleanpath
Fix root path handling for WebDAV ext storage
Thomas Müller [Wed, 12 Nov 2014 08:16:26 +0000 (09:16 +0100)]
Merge pull request #12107 from owncloud/dav-propfindmimetype
Return real mime type on PROPFIND
Jenkins for ownCloud [Wed, 12 Nov 2014 06:55:24 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 12 Nov 2014 00:40:07 +0000 (01:40 +0100)]
Merge pull request #12114 from owncloud/fix-pimple
Fix Pimple unset
Bernhard Posselt [Tue, 11 Nov 2014 21:04:46 +0000 (22:04 +0100)]
Fix Pimple unset
Thomas Müller [Tue, 11 Nov 2014 19:37:50 +0000 (20:37 +0100)]
Merge pull request #11917 from owncloud/fix-11909
Add checkbox to enforce SSL for subdomains
Jan-Christoph Borchardt [Tue, 11 Nov 2014 16:12:17 +0000 (17:12 +0100)]
Merge pull request #11929 from owncloud/fix-db-center
fixes not centered database chooser on setup page
Vincent Petry [Tue, 11 Nov 2014 14:42:50 +0000 (15:42 +0100)]
Return real mime type on PROPFIND
Return the real (insecure) mime type on PROPFIND
Vincent Petry [Tue, 11 Nov 2014 14:20:36 +0000 (15:20 +0100)]
Fix root path handling for WebDAV ext storage
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
Morris Jobke [Tue, 11 Nov 2014 12:29:39 +0000 (13:29 +0100)]
Merge pull request #12100 from owncloud/fix-infinite-loop
Fix infinite loop if count and limit is 0
Morris Jobke [Tue, 11 Nov 2014 11:15:30 +0000 (12:15 +0100)]
Fix infinite loop if count and limit is 0
* otherwise it will always think it hits the limit and need another round to fetch additional results
Morris Jobke [Tue, 11 Nov 2014 10:16:41 +0000 (11:16 +0100)]
Merge pull request #11789 from owncloud/fix-11762
[LDAP] Login: dont fail with 500 if configured display name attribute is not set
Jenkins for ownCloud [Tue, 11 Nov 2014 06:55:23 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Adam Williamson [Tue, 11 Nov 2014 01:49:35 +0000 (17:49 -0800)]
storage test: use new file for testTouchCreateFile()
this test would never succeed, because the previous test -
testFOpen() - creates the file 'foo', but testTouchCreateFile()
starts out by asserting it doesn't exist. Change the test to
use a file called 'touch' instead (which does not previously
exist).
Adam Williamson [Sat, 8 Nov 2014 08:38:00 +0000 (00:38 -0800)]
fix touch() when $mtime is set (Google wants RFC3339) #11267
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.
This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989).
Morris Jobke [Mon, 10 Nov 2014 12:11:22 +0000 (13:11 +0100)]
Merge pull request #10966 from owncloud/storage-root-share-permissions
Dont' use mountpoint permissions as share permissions for external storages
Morris Jobke [Mon, 10 Nov 2014 12:06:46 +0000 (13:06 +0100)]
Merge pull request #12070 from owncloud/accessibility-fixes
Accessibility fixes
Morris Jobke [Mon, 10 Nov 2014 11:59:56 +0000 (12:59 +0100)]
Merge pull request #12069 from owncloud/clean-l10n
Remove *.pot
Vincent Petry [Mon, 10 Nov 2014 11:52:52 +0000 (12:52 +0100)]
Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry
Convert StorageNotAvailableException to SabreDAV exception
Vincent Petry [Mon, 10 Nov 2014 11:46:53 +0000 (12:46 +0100)]
Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
Vincent Petry [Thu, 6 Nov 2014 09:59:36 +0000 (10:59 +0100)]
Convert StorageNotAvailableException to SabreDAV exception
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.
This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
Thomas Müller [Mon, 10 Nov 2014 10:33:20 +0000 (11:33 +0100)]
Remove *.pot
Jan-Christoph Borchardt [Mon, 10 Nov 2014 10:16:10 +0000 (11:16 +0100)]
Merge pull request #12065 from owncloud/loginname-username
Login Name -> Username in user management
Morris Jobke [Mon, 10 Nov 2014 09:52:47 +0000 (10:52 +0100)]
Login Name -> Username in user management
Jenkins for ownCloud [Mon, 10 Nov 2014 06:54:30 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Nov 2014 06:54:30 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Sat, 8 Nov 2014 14:46:21 +0000 (15:46 +0100)]
Merge pull request #12050 from owncloud/use-proper-array-name
Use proper array key
Lukas Reschke [Sat, 8 Nov 2014 13:46:57 +0000 (14:46 +0100)]
Merge pull request #12038 from sebomoto/fix-user-dropdown
changed default dropdown content
Lukas Reschke [Sat, 8 Nov 2014 13:27:20 +0000 (14:27 +0100)]
Use proper array key
Fixes https://github.com/owncloud/core/issues/12047
Jenkins for ownCloud [Sat, 8 Nov 2014 06:54:35 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jan-Christoph Borchardt [Sat, 8 Nov 2014 00:47:46 +0000 (01:47 +0100)]
use proper tabindex order: 1. app menu, 2. search, 3. user menu
Sebastian Bolt [Fri, 7 Nov 2014 20:56:48 +0000 (21:56 +0100)]
changed default dropdown content
to fix issue #11959
Craig Morrissey [Fri, 7 Nov 2014 17:45:42 +0000 (12:45 -0500)]
logging changes
Björn Schießle [Fri, 7 Nov 2014 15:20:42 +0000 (16:20 +0100)]
Merge pull request #11736 from owncloud/enc_get_fileinfo_from_real_file
if we read a .part file we try to get the file info from the real file
Bjoern Schiessle [Mon, 27 Oct 2014 11:51:52 +0000 (12:51 +0100)]
only set the values we need and make sure that we write the file info for both
the real file and the part file, because some information from the part file
might be needed later
Bjoern Schiessle [Thu, 30 Oct 2014 09:51:25 +0000 (10:51 +0100)]
don't scan part files
Bjoern Schiessle [Thu, 23 Oct 2014 12:57:53 +0000 (14:57 +0200)]
also try to get file info from part file
Robin Appelman [Fri, 7 Nov 2014 13:42:17 +0000 (14:42 +0100)]
Merge pull request #11575 from owncloud/cache-watcher-propagate
Propagate etag changes when the watcher finds a changed file
Bjoern Schiessle [Wed, 5 Nov 2014 13:42:36 +0000 (14:42 +0100)]
clean up encryption exceptions
Robin Appelman [Tue, 14 Oct 2014 15:15:46 +0000 (17:15 +0200)]
Also propagate etag changes when the watcher finds a changed file
Lukas Reschke [Fri, 7 Nov 2014 10:19:04 +0000 (11:19 +0100)]
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
Enc stop uploading if private key is missing
Thomas Müller [Fri, 7 Nov 2014 10:01:10 +0000 (11:01 +0100)]
Merge pull request #12019 from owncloud/fix-template-shortcuts
second parameter in template shortcuts script() and style() is optional
Jenkins for ownCloud [Fri, 7 Nov 2014 06:55:10 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Thu, 6 Nov 2014 21:43:57 +0000 (22:43 +0100)]
Merge pull request #12003 from owncloud/password-migration
Use new hashing API for OC_User_Database
Morris Jobke [Thu, 6 Nov 2014 20:26:50 +0000 (21:26 +0100)]
second parameter in template shortcuts script() and style() is optional
Morris Jobke [Thu, 6 Nov 2014 18:43:11 +0000 (19:43 +0100)]
Merge pull request #12009 from owncloud/make-optional
Make second argument optional
Robin Appelman [Thu, 6 Nov 2014 18:24:24 +0000 (19:24 +0100)]
Merge pull request #11945 from owncloud/share-setup-other-user
Setup shared mounts for the correct user when setting up the filesystem
Robin Appelman [Thu, 6 Nov 2014 17:31:33 +0000 (18:31 +0100)]
Fix sharing tests
Robin Appelman [Thu, 6 Nov 2014 16:22:59 +0000 (17:22 +0100)]
Support displaynames for dummy user backend
Robin Appelman [Tue, 4 Nov 2014 14:16:58 +0000 (15:16 +0100)]
Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user
Robin Appelman [Tue, 4 Nov 2014 14:15:58 +0000 (15:15 +0100)]
Dont make real users in tests
Lukas Reschke [Thu, 6 Nov 2014 17:17:21 +0000 (18:17 +0100)]
Make second argument optional
Equivalent to addVendorScript und addScript from OC_Util
Lukas Reschke [Thu, 6 Nov 2014 15:32:53 +0000 (16:32 +0100)]
Load PHPAss via autoloader
Morris Jobke [Thu, 6 Nov 2014 15:30:44 +0000 (16:30 +0100)]
Merge pull request #12000 from owncloud/bower-strengthify
bower strengthify
Morris Jobke [Thu, 6 Nov 2014 13:47:58 +0000 (14:47 +0100)]
bower strengthify
Jan-Christoph Borchardt [Thu, 6 Nov 2014 15:22:57 +0000 (16:22 +0100)]
add relevant focus styles to the existing hover styles