summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update grammarVolkan Gezer2014-11-211-1/+1
| | | Suggested by mnestis on Transifex.
* Revert "drop OC_Preferences::getUsers and getApps"Morris Jobke2014-11-203-0/+82
| | | | This reverts commit 09fd34eed908203674721af86ce889bfd0a0ef8d.
* Merge pull request #12336 from owncloud/drop-getApps-getUsersMorris Jobke2014-11-203-82/+0
|\ | | | | drop OC_Preferences::getUsers and getApps
| * drop OC_Preferences::getUsers and getAppsMorris Jobke2014-11-203-82/+0
|/
* Merge pull request #12330 from owncloud/jenkins-eat-thatMorris Jobke2014-11-207-42/+40
|\ | | | | drop dependency of some commands on old config object
| * drop dependency of some commands on old config objectMorris Jobke2014-11-207-42/+40
| |
* | Merge pull request #12321 from owncloud/checkForXMLWriterThomas Müller2014-11-201-0/+1
|\ \ | | | | | | Check for XMLWriter class
| * | Check for XMLWriter classLukas Reschke2014-11-201-0/+1
| | | | | | | | | | | | This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
* | | Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-202-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue when uploading files to external storage when recovery keys are enabled The Util class only works with real users, so instantiating it with the virtual recovery key user or public key user can cause issues.
* | | Merge pull request #12299 from owncloud/clean-lib-base-configMorris Jobke2014-11-201-23/+29
|\ \ \ | | | | | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP...
| * | | replace double quotes with single quotesMorris Jobke2014-11-191-1/+1
| | | |
| * | | replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfigMorris Jobke2014-11-191-23/+29
| | | |
* | | | Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-2074-1417/+0
|\ \ \ \ | |_|_|/ |/| | | cleanup languages. closes #11274
| * | | cleanup languages. closes #11274Volkan Gezer2014-11-2074-1417/+0
| | | |
* | | | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-206-17/+42
|\ \ \ \ | | | | | | | | | | Remove phpass and migrate to new Hasher interface
| * | | | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-176-17/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-20187-359/+644
|\ \ \ \ \ | |_|/ / / |/| | | | Issue/10991 all testcase
| * | | | Make remaining files extend the test baseJoas Schilling2014-11-1970-117/+191
| | | | |
| * | | | Make root tests extend the \Test\TestCaseJoas Schilling2014-11-1946-83/+160
| | | | |
| * | | | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-1940-91/+161
| | | | |
| * | | | Use base class to reset the file mapperJoas Schilling2014-11-1933-68/+132
| | | | |
* | | | | Merge pull request #12305 from owncloud/sharelist-nodeleteMorris Jobke2014-11-202-12/+30
|\ \ \ \ \ | | | | | | | | | | | | Remove delete button in shared with others list
| * | | | | JSHint fixes in sharedfilelistSpec unit test fileVincent Petry2014-11-191-1/+3
| | | | | |
| * | | | | Remove delete button in shared with others listVincent Petry2014-11-192-11/+27
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file is shared with others or with link, a delete button used to be visible that triggered a direct deletion. This button has been removed to avoid accidental deletion from people who might believe it was an unshare button. Unsharing is still possible inside the share dropdown.
* | | | | Merge pull request #12253 from owncloud/port-12154Vincent Petry2014-11-206-14/+54
|\ \ \ \ \ | | | | | | | | | | | | Port 12154
| * | | | | Add repair steps for legacy config filesLukas Reschke2014-11-182-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php
| * | | | | Ignore port for trusted domainsLukas Reschke2014-11-184-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php
* | | | | | Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjsVincent Petry2014-11-203-2/+106
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added function to load translations from JS
| * | | | | | Fix l10n promisesVincent Petry2014-11-192-6/+11
| | | | | | |
| * | | | | | Better use of promise in OC.L10N.load()Vincent Petry2014-11-191-13/+8
| | | | | | |
| * | | | | | Remove stray generateUrlVincent Petry2014-11-191-5/+0
| | | | | | |
| * | | | | | Added function to load translations from JSVincent Petry2014-11-183-2/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For apps that support async translation loading, a new function OC.L10N.load() can be used to asynchronously load the translations for a given app.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-20174-774/+406
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2Lukas Reschke2014-11-191-0/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Show warning when invalid user was passed
| * | | | | Show warning when invalid user was passedVincent Petry2014-11-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes there are bugs that cause setupFS() to be called for non-existing users. Instead of failing hard and breaking the instance, this fix simply logs a warning.
* | | | | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPasswordLukas Reschke2014-11-1915-150/+388
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Warn for password reset when files_encryption is enabled
| * | | | | center spinnerMorris Jobke2014-11-182-1/+7
| | | | | |
| * | | | | Show spinnerLukas Reschke2014-11-172-0/+2
| | | | | |
| * | | | | fix unreadable label in warning boxMorris Jobke2014-11-171-0/+6
| | | | | |
| * | | | | Hide submit button after password changeLukas Reschke2014-11-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
| * | | | | listen to the post_passwordReset hook, backup the old keys and create a new ↵Bjoern Schiessle2014-11-173-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | key pair for the user
| * | | | | add password as parameter to the signal so that the encryption can create a ↵Bjoern Schiessle2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | new key-pair
| * | | | | Add "postPasswordReset" hookLukas Reschke2014-11-171-4/+8
| | | | | |
| * | | | | Use correct route insteadLukas Reschke2014-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THX @schiesbn (I should setup a mail server on my local system...)
| * | | | | Remove uneeded importLukas Reschke2014-11-171-1/+0
| | | | | |
| * | | | | Fix scrutinizer issuesLukas Reschke2014-11-171-1/+1
| | | | | |
| * | | | | Warn for password reset when files_encryption is enabledLukas Reschke2014-11-1710-149/+341
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password. Furthermore I updated the code to use our new classes and added some unit tests for it :dancers: Fixes https://github.com/owncloud/core/issues/11438
* | | | | Merge pull request #12276 from ↵Morris Jobke2014-11-193-1/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/undelete-only-if-files-trashin-is-enabled Only show undelete capability if files_trashbin is enabled
| * | | | | Only show undelete capability if files_trashbin is enabledLukas Reschke2014-11-183-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1984-90/+20
| | | | | |