]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Tue, 17 Mar 2015 10:15:39 +0000 (11:15 +0100)]
Merge pull request #12085 from owncloud/add-swift-mailer
Migrate OC_Mail to SwiftMailer
Vincent Petry [Tue, 17 Mar 2015 08:51:45 +0000 (09:51 +0100)]
Merge pull request #14929 from owncloud/s2s-scanner-warnings
Fix scanFile signature warnings
Jenkins for ownCloud [Tue, 17 Mar 2015 05:55:43 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 16 Mar 2015 17:47:42 +0000 (18:47 +0100)]
Merge pull request #14936 from owncloud/fix-setup-config
Fix setup config namespace
Vincent Petry [Mon, 16 Mar 2015 16:57:34 +0000 (17:57 +0100)]
Fix setup config
Vincent Petry [Mon, 16 Mar 2015 16:14:09 +0000 (17:14 +0100)]
Merge pull request #14923 from owncloud/fix-preference-key-definition
Fix user preference key definition for insertIfNotExists()
Thomas Müller [Mon, 16 Mar 2015 16:04:06 +0000 (17:04 +0100)]
Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_installation
Write the parameter 'logtimezone' into config.php during setup
Vincent Petry [Mon, 16 Mar 2015 16:01:49 +0000 (17:01 +0100)]
Merge pull request #14877 from owncloud/smb-constructor-noconnect
Wait with getting the timezone from the smb server until we need it
Vincent Petry [Mon, 16 Mar 2015 15:45:11 +0000 (16:45 +0100)]
Fix scanFile signature warnings
Joas Schilling [Mon, 16 Mar 2015 14:41:00 +0000 (15:41 +0100)]
Also add a note that clob does not work in the compare array
Joas Schilling [Mon, 16 Mar 2015 14:37:12 +0000 (15:37 +0100)]
The key is over configkey, user and app, not the value
stupid me :(
Lukas Reschke [Mon, 16 Mar 2015 13:10:03 +0000 (14:10 +0100)]
Don't fallback to Plaintext per default for legacy class
Lukas Reschke [Mon, 16 Mar 2015 12:01:17 +0000 (13:01 +0100)]
Add debug log message back
Lukas Reschke [Thu, 19 Feb 2015 20:55:02 +0000 (21:55 +0100)]
Show more detailed error message
Lukas Reschke [Thu, 19 Feb 2015 18:40:05 +0000 (19:40 +0100)]
Adjust unit test
Lukas Reschke [Thu, 19 Feb 2015 17:55:27 +0000 (18:55 +0100)]
Incorporate review changes
Lukas Reschke [Thu, 12 Feb 2015 15:03:51 +0000 (16:03 +0100)]
Use new IMailer and add unit-tests for lostcontroller
Lukas Reschke [Thu, 12 Feb 2015 12:53:27 +0000 (13:53 +0100)]
Migrate to SwiftMail
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.
Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014
Conflicts:
3rdparty
lib/private/server.php
lib/public/iservercontainer.php
tests/lib/mail.php
tests/settings/controller/mailsettingscontrollertest.php
Conflicts:
3rdparty
lib/private/mail.php
lib/private/server.php
lib/public/iservercontainer.php
settings/ajax/lostpassword.php
settings/application.php
Thomas Müller [Mon, 16 Mar 2015 11:22:27 +0000 (12:22 +0100)]
Merge pull request #14883 from owncloud/imagepng_expects_resource_issue
validate resource's integrity before using it
Georg Ehrke [Fri, 13 Mar 2015 16:23:02 +0000 (17:23 +0100)]
validate resource's integrity before using it
Morris Jobke [Mon, 16 Mar 2015 09:31:36 +0000 (10:31 +0100)]
Merge pull request #14766 from owncloud/fix-insertifnotexists-poc
Allow specifying the compare-array for insertIfNotExists()
Thomas Müller [Mon, 16 Mar 2015 09:05:57 +0000 (10:05 +0100)]
Merge pull request #14133 from rullzer/fix_10600
Always display max upload size in admin panel
Thomas Müller [Mon, 16 Mar 2015 09:04:05 +0000 (10:04 +0100)]
Merge pull request #14644 from owncloud/trash-expire-command
Expire files from the trash in the background
Thomas Müller [Mon, 16 Mar 2015 08:58:41 +0000 (09:58 +0100)]
Merge pull request #14776 from owncloud/fix-14629-master
verify the file name length not to exceed 255 characters + verify path d...
Thomas Müller [Mon, 16 Mar 2015 08:56:31 +0000 (09:56 +0100)]
Merge pull request #14848 from owncloud/kill-curl-fallback-master
drop any fallback code related to curl
Jenkins for ownCloud [Mon, 16 Mar 2015 05:55:15 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 15 Mar 2015 19:20:32 +0000 (20:20 +0100)]
Merge pull request #14899 from owncloud/setupwarning-text
Put notice about checking logs in setup warning
Jenkins for ownCloud [Sun, 15 Mar 2015 05:54:38 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Robin McCorkell [Sun, 15 Mar 2015 01:22:03 +0000 (01:22 +0000)]
Put notice about checking logs in setup warning
Joas Schilling [Sat, 14 Mar 2015 10:43:18 +0000 (11:43 +0100)]
Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-object
Fix getting the avatar of a non-existing user
Jenkins for ownCloud [Sat, 14 Mar 2015 05:54:45 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 13 Mar 2015 22:30:49 +0000 (23:30 +0100)]
Merge pull request #14871 from owncloud/use-proper-error-type
Use proper error type and clean-up code
Thomas Müller [Fri, 13 Mar 2015 22:00:03 +0000 (23:00 +0100)]
Merge pull request #14880 from owncloud/drop-example-backend
Drop example user backend
Joas Schilling [Fri, 13 Mar 2015 16:35:34 +0000 (17:35 +0100)]
No user no avatar easy as that
Lukas Reschke [Fri, 13 Mar 2015 15:19:52 +0000 (16:19 +0100)]
Remove outdated comment
Lukas Reschke [Fri, 13 Mar 2015 15:12:32 +0000 (16:12 +0100)]
Drop example user backend
We already provide an interface for application developers, this file is outdated and thus should get removed.
Addresses No. 3 from https://github.com/owncloud/core/issues/14847
Morris Jobke [Fri, 13 Mar 2015 14:53:22 +0000 (15:53 +0100)]
Merge pull request #14867 from owncloud/drop-OC_User_HTTP
Remove OC_User_HTTP
Joas Schilling [Fri, 13 Mar 2015 12:30:26 +0000 (13:30 +0100)]
Color avatars of non-existing users gray and display X instead
Joas Schilling [Fri, 13 Mar 2015 14:14:01 +0000 (15:14 +0100)]
Fix order of expected and actual on assertEquals() calls
Joas Schilling [Fri, 13 Mar 2015 12:12:14 +0000 (13:12 +0100)]
Fix getting the avatar of a non-existing user
Robin Appelman [Fri, 13 Mar 2015 13:35:37 +0000 (14:35 +0100)]
Wait with getting the timezone from the smb server until we need it
Lukas Reschke [Fri, 13 Mar 2015 13:36:00 +0000 (14:36 +0100)]
Merge pull request #14874 from owncloud/correct-typehint
Can also be null
Lukas Reschke [Fri, 13 Mar 2015 12:19:29 +0000 (13:19 +0100)]
Can also be null
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
Lukas Reschke [Fri, 13 Mar 2015 12:04:31 +0000 (13:04 +0100)]
Use proper error type and clean-up code
blizzz [Fri, 13 Mar 2015 12:16:33 +0000 (13:16 +0100)]
Merge pull request #14849 from owncloud/fix-11292
support paged results against 389ds.
Lukas Reschke [Fri, 13 Mar 2015 11:26:33 +0000 (12:26 +0100)]
Remove OC_User_HTTP
Addresses No. 1 from https://github.com/owncloud/core/issues/14847
Thomas Müller [Fri, 13 Mar 2015 08:25:05 +0000 (09:25 +0100)]
Merge pull request #14844 from owncloud/fix-14843-master
cron shall not operate in case we are in maintenance mode
Jenkins for ownCloud [Fri, 13 Mar 2015 05:54:55 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Arthur Schiwon [Thu, 12 Mar 2015 21:47:20 +0000 (22:47 +0100)]
support paged results against 389ds.
Thomas Müller [Thu, 12 Mar 2015 20:43:41 +0000 (21:43 +0100)]
drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-
78586447
Thomas Müller [Thu, 12 Mar 2015 20:03:26 +0000 (21:03 +0100)]
cron shall not operate in case we are in maintenance mode - fixes #14843
Thomas Müller [Thu, 12 Mar 2015 19:37:14 +0000 (20:37 +0100)]
Merge pull request #14838 from owncloud/add-curl-hard-dependency
Add cURL as hard-dependency
Lukas Reschke [Thu, 12 Mar 2015 17:39:54 +0000 (18:39 +0100)]
Add cURL as hard-dependency
It is required by other functionalities such as S2S anyways and ownCloud will fail hard at a lot of places without it.
Morris Jobke [Thu, 12 Mar 2015 15:12:26 +0000 (16:12 +0100)]
Merge pull request #14830 from owncloud/kill-locks-table-master
we no longer support webdav locks - no need to keep the column
Thomas Müller [Thu, 12 Mar 2015 14:23:44 +0000 (15:23 +0100)]
we no longer support webdav locks - no need to keep the column
Thomas Müller [Tue, 10 Mar 2015 12:08:22 +0000 (13:08 +0100)]
verify the file name length not to exceed 255 characters + verify path during rename
Thomas Müller [Thu, 12 Mar 2015 09:45:03 +0000 (10:45 +0100)]
Merge pull request #14785 from owncloud/issue/14733-active-class-missing-for-admin-navigation-entry
Do not overwrite the active menu entry of the navigation
Morris Jobke [Thu, 12 Mar 2015 09:06:21 +0000 (10:06 +0100)]
Merge pull request #14613 from kampka/no-table-prefix
Install command should not require table prefix
Joas Schilling [Thu, 12 Mar 2015 08:18:43 +0000 (09:18 +0100)]
Also use all keys for an empty array, just in case
Jenkins for ownCloud [Thu, 12 Mar 2015 05:55:59 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Wed, 11 Mar 2015 22:27:47 +0000 (23:27 +0100)]
Merge pull request #14809 from rullzer/avatarcontroller_cache_fix
Fix the avatarcontroller cache needing the cache dir
Christian Kampka [Sat, 28 Feb 2015 20:41:33 +0000 (21:41 +0100)]
Install command should not require table prefix
Morris Jobke [Wed, 11 Mar 2015 17:33:51 +0000 (18:33 +0100)]
Merge pull request #14357 from owncloud/fix/1373
Run `updateDataDirectory` after Update
Roeland Jago Douma [Wed, 11 Mar 2015 17:18:33 +0000 (18:18 +0100)]
Fix the avatarcontroller cache needing the cache dir
This was removed in
82254ad5efb65e8650567f49343ec37eb55e2f3e and
unfortunatly missed by jenkins before mering into master.
Lukas Reschke [Wed, 11 Mar 2015 16:15:42 +0000 (17:15 +0100)]
Merge pull request #14705 from rullzer/avatarcontroller
Move AvatarController to AppFramework
Morris Jobke [Wed, 11 Mar 2015 15:49:24 +0000 (16:49 +0100)]
Merge pull request #13893 from owncloud/create-cachedir-on-user
Only make sure the cache directory exists when we use it
Roeland Jago Douma [Tue, 3 Mar 2015 11:52:27 +0000 (12:52 +0100)]
Avatar controller moved to AppFrameWork
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
Lukas Reschke [Wed, 11 Mar 2015 15:14:54 +0000 (16:14 +0100)]
Merge pull request #14798 from owncloud/enable-oci-autotest-master
Setting oci as supported database
Morris Jobke [Wed, 11 Mar 2015 15:09:23 +0000 (16:09 +0100)]
Merge pull request #14794 from owncloud/add-console-command-user-add
Add a console command user:add to create users over the console
Morris Jobke [Wed, 11 Mar 2015 14:56:32 +0000 (15:56 +0100)]
Merge pull request #13648 from oparoz/sfnt-fonts-preview
Add support for font previews
Thomas Müller [Wed, 11 Mar 2015 14:47:24 +0000 (15:47 +0100)]
Don't play with config values ...
Lukas Reschke [Wed, 11 Mar 2015 14:13:59 +0000 (15:13 +0100)]
Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view
Allow iframes from same domain in share view
Morris Jobke [Wed, 11 Mar 2015 13:38:41 +0000 (14:38 +0100)]
Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown
Better finding the remote URL from user input in share dropdown
Thomas Müller [Wed, 11 Mar 2015 13:29:22 +0000 (14:29 +0100)]
Setting oci as supported database
Joas Schilling [Wed, 11 Mar 2015 11:35:16 +0000 (12:35 +0100)]
Add a console command user:add to create users over the console
Morris Jobke [Wed, 11 Mar 2015 12:32:33 +0000 (13:32 +0100)]
Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail
Do not abort when meeting unfixable legacy storages
Lukas Reschke [Wed, 11 Mar 2015 11:52:18 +0000 (12:52 +0100)]
Merge pull request #14791 from owncloud/fix-14516
Adding a more meaningful message for sabre dav exception
Thomas Müller [Wed, 11 Mar 2015 11:26:49 +0000 (12:26 +0100)]
Merge pull request #14788 from cmeh/patch-3
Correct "one invalid characters" to "one invalid character"
Thomas Müller [Wed, 11 Mar 2015 11:23:22 +0000 (12:23 +0100)]
Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
Add an option to include the installed app version in "occ app:list"
Thomas Müller [Wed, 11 Mar 2015 10:53:31 +0000 (11:53 +0100)]
Adding a more meaningful message for sabre dav exception - fixes #14516
Bernhard Posselt [Wed, 11 Mar 2015 10:28:28 +0000 (11:28 +0100)]
Merge pull request #14789 from owncloud/better-app-install-error-messages
display app update error messages
Thomas Müller [Wed, 11 Mar 2015 10:00:49 +0000 (11:00 +0100)]
Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master
Use occ to install ownCloud in autotest.sh
Thomas Müller [Wed, 11 Mar 2015 08:59:56 +0000 (09:59 +0100)]
display app update error messages - fixes #14611
cmeh [Wed, 11 Mar 2015 08:59:42 +0000 (09:59 +0100)]
Correct "one invalid characters" to "one invalid character"
Corrected "one invalid characters" to "one invalid character" in line 1575.
Joas Schilling [Tue, 3 Mar 2015 09:26:09 +0000 (10:26 +0100)]
Always include the installed app version in "occ app:list"
Joas Schilling [Wed, 11 Mar 2015 08:33:50 +0000 (09:33 +0100)]
Throw a RuntimeException in the cache aswell
Joas Schilling [Wed, 11 Mar 2015 08:27:28 +0000 (09:27 +0100)]
Do not overwrite the active menu entry of the navigation
Thomas Müller [Tue, 10 Mar 2015 22:44:29 +0000 (23:44 +0100)]
Properly handle available databases at runtime and respect setup checks in command line as well
Thomas Müller [Tue, 10 Mar 2015 21:59:23 +0000 (22:59 +0100)]
No need to restart the web server in cli mode
Thomas Müller [Tue, 10 Mar 2015 14:59:07 +0000 (15:59 +0100)]
Use occ to install ownCloud in autotest.sh
Morris Jobke [Wed, 11 Mar 2015 08:23:22 +0000 (09:23 +0100)]
Merge pull request #14783 from owncloud/dont-timeout-cron-master
cron.php on cli has no time limitation - fixes #14481
Joas Schilling [Wed, 11 Mar 2015 08:00:47 +0000 (09:00 +0100)]
Fix doc blocks of insertIfNotExists() method
Jenkins for ownCloud [Wed, 11 Mar 2015 05:55:38 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Wed, 11 Mar 2015 00:09:12 +0000 (01:09 +0100)]
cron.php on cli has no time limitation - fixes #14481
Thomas Müller [Tue, 10 Mar 2015 23:54:20 +0000 (00:54 +0100)]
Merge pull request #14640 from owncloud/rescanversionsonlyonce
Only rescan versions once in trashbin
Morris Jobke [Tue, 10 Mar 2015 15:06:01 +0000 (16:06 +0100)]
update 3rdparty master
Morris Jobke [Tue, 10 Mar 2015 15:05:12 +0000 (16:05 +0100)]
Merge pull request #14115 from owncloud/update-symphony-components
update symphony components to 2.6.4
Robin Appelman [Tue, 10 Mar 2015 13:47:08 +0000 (14:47 +0100)]
update symphony components to 2.6.4
Lukas Reschke [Tue, 10 Mar 2015 13:18:21 +0000 (14:18 +0100)]
Merge pull request #14759 from owncloud/clean-up-code
Clean-up code and use proper exception types
Thomas Müller [Tue, 10 Mar 2015 10:47:52 +0000 (11:47 +0100)]
don't rely on \OCP\User::getUser() - it is not set properly in case of async operations