]>
source.dussan.org Git - nextcloud-server.git/log
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
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
Lukas Reschke [Thu, 6 Nov 2014 15:04:54 +0000 (16:04 +0100)]
Merge pull request #11998 from owncloud/add-get-logger-to-interface
Add getLogger() to IServerContainer
Lukas Reschke [Thu, 6 Nov 2014 14:42:06 +0000 (15:42 +0100)]
Use new hashing API for OC_User_Database
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
Thomas Müller [Thu, 6 Nov 2014 14:17:12 +0000 (15:17 +0100)]
Merge pull request #11947 from owncloud/public-hash-api
Add OCP\Security\IHasher
Lukas Reschke [Tue, 4 Nov 2014 15:05:31 +0000 (16:05 +0100)]
Add OCP\Security\IHasher
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-
61624662
Requires https://github.com/owncloud/3rdparty/pull/136
Morris Jobke [Thu, 6 Nov 2014 14:02:32 +0000 (15:02 +0100)]
update to 3rdparty master
Lukas Reschke [Thu, 6 Nov 2014 13:39:51 +0000 (14:39 +0100)]
Merge pull request #11883 from owncloud/clear-session-for-setup
Clear session before setup
Lukas Reschke [Thu, 6 Nov 2014 12:52:25 +0000 (13:52 +0100)]
Merge pull request #11972 from owncloud/usermanager-remove-delete
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
Lukas Reschke [Thu, 6 Nov 2014 12:42:00 +0000 (13:42 +0100)]
Merge pull request #11993 from owncloud/enc_repeat_password
[encryption] check if the provided password is really the current log-in password
Lukas Reschke [Thu, 6 Nov 2014 12:36:36 +0000 (13:36 +0100)]
Add getLogger() to IServerContainer
Makes my IDE complaining less ;-)
Thomas Müller [Thu, 6 Nov 2014 12:28:30 +0000 (13:28 +0100)]
Merge pull request #11984 from owncloud/bower-md5
bower md5
Morris Jobke [Wed, 5 Nov 2014 21:58:48 +0000 (22:58 +0100)]
md5 now handled via bower
Morris Jobke [Thu, 6 Nov 2014 11:44:36 +0000 (12:44 +0100)]
Merge pull request #11985 from owncloud/bower-snap
bower snapjs
Morris Jobke [Wed, 5 Nov 2014 22:19:11 +0000 (23:19 +0100)]
bower snapjs
Thomas Müller [Thu, 6 Nov 2014 10:57:33 +0000 (11:57 +0100)]
Merge pull request #11989 from owncloud/bower-zxcvbn
bower zxcvbn
Morris Jobke [Thu, 6 Nov 2014 09:15:22 +0000 (10:15 +0100)]
bower zxcvbn
Thomas Müller [Thu, 6 Nov 2014 10:49:39 +0000 (11:49 +0100)]
Merge pull request #11981 from owncloud/bower-jcrop
bower jcrop
Bjoern Schiessle [Thu, 6 Nov 2014 10:11:46 +0000 (11:11 +0100)]
check if the provided password is really the current log-in password
Morris Jobke [Wed, 5 Nov 2014 20:44:31 +0000 (21:44 +0100)]
bower jcrop
Morris Jobke [Thu, 6 Nov 2014 08:27:58 +0000 (09:27 +0100)]
Merge pull request #11980 from owncloud/bower-select2
bower select2
Morris Jobke [Thu, 6 Nov 2014 08:27:12 +0000 (09:27 +0100)]
manage select2 via bower
Vincent Petry [Thu, 6 Nov 2014 07:42:29 +0000 (08:42 +0100)]
Merge pull request #11982 from owncloud/bower-underscore
bower underscore
Jenkins for ownCloud [Thu, 6 Nov 2014 06:55:04 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 5 Nov 2014 23:47:25 +0000 (00:47 +0100)]
Merge pull request #11983 from owncloud/drop-chosen
drop unused library chosen
Morris Jobke [Wed, 5 Nov 2014 21:05:24 +0000 (22:05 +0100)]
bower underscore
Morris Jobke [Wed, 5 Nov 2014 21:41:33 +0000 (22:41 +0100)]
drop unused library chosen
Thomas Müller [Wed, 5 Nov 2014 15:50:58 +0000 (16:50 +0100)]
Merge pull request #11970 from owncloud/bower-handlebars
bower handlebars
Morris Jobke [Wed, 5 Nov 2014 13:14:23 +0000 (14:14 +0100)]
bower handlebars
Lukas Reschke [Wed, 5 Nov 2014 15:43:24 +0000 (16:43 +0100)]
Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
Robin Appelman [Wed, 5 Nov 2014 14:45:58 +0000 (15:45 +0100)]
Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead
Lukas Reschke [Wed, 5 Nov 2014 14:04:23 +0000 (15:04 +0100)]
Merge pull request #11968 from owncloud/drop-jquery-placeholder
drop unused jquery.placeholder
Thomas Müller [Wed, 5 Nov 2014 13:18:16 +0000 (14:18 +0100)]
Merge pull request #11355 from owncloud/unbold
Unbold
Jan-Christoph Borchardt [Mon, 29 Sep 2014 14:39:07 +0000 (16:39 +0200)]
explicitly unbold text by default, otherwise might be bold
Jan-Christoph Borchardt [Mon, 29 Sep 2014 14:38:37 +0000 (16:38 +0200)]
unbold labels and folders
Thomas Müller [Wed, 5 Nov 2014 13:03:12 +0000 (14:03 +0100)]
Merge pull request #11965 from owncloud/fix-jsonresponse
fix typo in content type for JSONResponse
Thomas Müller [Wed, 5 Nov 2014 12:54:29 +0000 (13:54 +0100)]
Merge pull request #11928 from owncloud/support-HTML-in-logo
Support HTML in logo
Thomas Müller [Wed, 5 Nov 2014 12:43:23 +0000 (13:43 +0100)]
Merge pull request #11962 from owncloud/fix-server-sharing-strings
adjust strings - fixed #11930
Morris Jobke [Wed, 5 Nov 2014 12:41:11 +0000 (13:41 +0100)]
drop unused jquery.placeholder
Morris Jobke [Wed, 5 Nov 2014 12:11:48 +0000 (13:11 +0100)]
Merge pull request #11966 from owncloud/drop-jquery-inview
drop jquery.inview as it is unused
Bjoern Schiessle [Tue, 4 Nov 2014 16:17:29 +0000 (17:17 +0100)]
throw exception if private key is missing
Morris Jobke [Wed, 5 Nov 2014 11:57:18 +0000 (12:57 +0100)]
drop jquery.inview as it is unused
Vincent Petry [Wed, 5 Nov 2014 11:44:10 +0000 (12:44 +0100)]
Merge pull request #11853 from owncloud/close-session-for-trashbin
Close session for files_trashbin
Bernhard Posselt [Wed, 5 Nov 2014 11:04:56 +0000 (12:04 +0100)]
fix typo in content type
Thomas Müller [Wed, 5 Nov 2014 10:31:53 +0000 (11:31 +0100)]
Merge pull request #11953 from owncloud/drop-listview-js
drop listview.js
Morris Jobke [Wed, 5 Nov 2014 10:13:00 +0000 (11:13 +0100)]
ignore core/vendor in scrutinizer
Thomas Müller [Wed, 5 Nov 2014 10:08:17 +0000 (11:08 +0100)]
adjust strings - fixed #11930
Jenkins for ownCloud [Wed, 5 Nov 2014 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Vincent Petry [Tue, 4 Nov 2014 19:05:49 +0000 (20:05 +0100)]
Merge pull request #11949 from owncloud/s2s-fixcertcheckwhennocertfile
Check for cert bundle existence before using it
Vincent Petry [Tue, 4 Nov 2014 16:37:15 +0000 (17:37 +0100)]
Store curl error message directly
Morris Jobke [Tue, 4 Nov 2014 16:28:35 +0000 (17:28 +0100)]
drop listview.js
* isn't used in core and isn't mentioned in documentation
Bjoern Schiessle [Tue, 4 Nov 2014 16:16:36 +0000 (17:16 +0100)]
still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue.
Vincent Petry [Tue, 4 Nov 2014 15:44:42 +0000 (16:44 +0100)]
Check for cert bundle existence before using it
Thomas Müller [Tue, 4 Nov 2014 13:51:19 +0000 (14:51 +0100)]
Merge pull request #11940 from owncloud/fix-underline-convention
fix shortcuts - underline instead of camelCase
Thomas Müller [Tue, 4 Nov 2014 13:49:58 +0000 (14:49 +0100)]
Merge pull request #11938 from owncloud/jshintrc-laxbreak
enable laxbreak option in jshintrc to comply with our coding guide lines
Morris Jobke [Tue, 4 Nov 2014 11:51:29 +0000 (12:51 +0100)]
migrate jQuery to bower
Vincent Petry [Tue, 4 Nov 2014 13:16:58 +0000 (14:16 +0100)]
Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
Only rescan trash folder when checking deleted versions
Morris Jobke [Tue, 4 Nov 2014 12:57:38 +0000 (13:57 +0100)]
fix shortcuts - underline instead of camelCase
blizzz [Tue, 4 Nov 2014 12:19:45 +0000 (13:19 +0100)]
Merge pull request #11362 from mark0n/rm_ldap_conf_cli
Add a CLI command that deletes an LDAP config
Arthur Schiwon [Tue, 4 Nov 2014 11:51:54 +0000 (12:51 +0100)]
enable laxbreak option in jshintrc to comply with our coding guide lines
Vincent Petry [Tue, 4 Nov 2014 11:29:42 +0000 (12:29 +0100)]
Only rescan trash folder when checking deleted versions
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
Morris Jobke [Tue, 4 Nov 2014 11:22:15 +0000 (12:22 +0100)]
fix whitespace
Morris Jobke [Tue, 4 Nov 2014 10:59:33 +0000 (11:59 +0100)]
Merge pull request #11916 from owncloud/introduce-bower
Introduce bower dependency managment for frontend libraries
Morris Jobke [Tue, 4 Nov 2014 10:38:26 +0000 (11:38 +0100)]
Merge pull request #11931 from owncloud/fix-js-unit-tests
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
Morris Jobke [Tue, 4 Nov 2014 09:55:18 +0000 (10:55 +0100)]
use https ... everywhere :)
Morris Jobke [Tue, 4 Nov 2014 09:37:16 +0000 (10:37 +0100)]
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
Morris Jobke [Tue, 4 Nov 2014 08:23:38 +0000 (09:23 +0100)]
fix config.sample.php linebreak
Jenkins for ownCloud [Tue, 4 Nov 2014 06:55:05 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 3 Nov 2014 20:20:42 +0000 (21:20 +0100)]
Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig
First check whether it is the default config before touching
Lukas Reschke [Mon, 3 Nov 2014 20:13:07 +0000 (21:13 +0100)]
Support HTML in logo claim
Morris Jobke [Mon, 3 Nov 2014 10:18:52 +0000 (11:18 +0100)]
replace moment.js with bower version
* fix JS unit tests
Morris Jobke [Mon, 3 Nov 2014 10:18:17 +0000 (11:18 +0100)]
ability to add bower resources
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
Morris Jobke [Mon, 3 Nov 2014 19:31:53 +0000 (20:31 +0100)]
update 3rdparty to master
Morris Jobke [Mon, 3 Nov 2014 19:30:59 +0000 (20:30 +0100)]
update 3rdparty to master
Thomas Müller [Mon, 3 Nov 2014 15:58:30 +0000 (16:58 +0100)]
Merge pull request #11918 from owncloud/pimple-composer
Update Pimple to V3.0
Thomas Müller [Mon, 3 Nov 2014 12:10:03 +0000 (13:10 +0100)]
Update Pimple to V3.0
Lukas Reschke [Mon, 3 Nov 2014 15:42:52 +0000 (16:42 +0100)]
Merge pull request #11921 from owncloud/symfony-composer
Symfony composer
Lukas Reschke [Mon, 3 Nov 2014 15:37:04 +0000 (16:37 +0100)]
First check whether it is the default config before touchign
Potentially fixes https://github.com/owncloud/core/issues/11678
Thomas Müller [Mon, 3 Nov 2014 14:44:39 +0000 (15:44 +0100)]
Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalized
Capitalize Checks in admin page
Vincent Petry [Mon, 3 Nov 2014 14:41:40 +0000 (15:41 +0100)]
Capitalize Checks in admin page