| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add puphpet and vagrant to gitignore | Georg Ehrke | 2014-11-23 | 1 | -0/+6 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-23 | 2 | -0/+2 |
| | | |||||
| * | Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci | Morris Jobke | 2014-11-22 | 2 | -4/+4 |
| |\ | | | | | Rename providers to not begin with test | ||||
| | * | Rename providers to not begin with test | Lukas Reschke | 2014-11-21 | 2 | -4/+4 |
| | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12347 | ||||
| * | | Merge pull request #12328 from owncloud/remove-testcleanuplistener | Morris Jobke | 2014-11-22 | 3 | -186/+111 |
| |\ \ | | | | | | | Remove testcleanuplistener | ||||
| | * | | Remove testcleanuplistener.php | Joas Schilling | 2014-11-20 | 2 | -181/+0 |
| | | | | |||||
| | * | | Clean up the test data in tearDownAfterClass() | Joas Schilling | 2014-11-20 | 1 | -5/+111 |
| | | | | | | | | | | | | | The result of the listener should then be empty and can be removed | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-22 | 42 | -12/+298 |
| | | | | |||||
| * | | | Merge pull request #12342 from owncloud/fix-master-unit-tests | Thomas Müller | 2014-11-21 | 1 | -2/+2 |
| |\ \ \ | |_|/ |/| | | fix unit tests of mdb2scheamreader | ||||
| | * | | fix unit tests of mdb2scheamreader | Morris Jobke | 2014-11-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-21 | 136 | -78/+1306 |
| | | | | |||||
| * | | | Merge pull request #12344 from owncloud/fixstypo | Thomas Müller | 2014-11-21 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | update grammar | ||||
| | * | | update grammar | Volkan Gezer | 2014-11-21 | 1 | -1/+1 |
| |/ / | | | | | Suggested by mnestis on Transifex. | ||||
| * | | Revert "drop OC_Preferences::getUsers and getApps" | Morris Jobke | 2014-11-20 | 3 | -0/+82 |
| | | | | | | | | | This reverts commit 09fd34eed908203674721af86ce889bfd0a0ef8d. | ||||
| * | | Merge pull request #12336 from owncloud/drop-getApps-getUsers | Morris Jobke | 2014-11-20 | 3 | -82/+0 |
| |\ \ | | | | | | | drop OC_Preferences::getUsers and getApps | ||||
| | * | | drop OC_Preferences::getUsers and getApps | Morris Jobke | 2014-11-20 | 3 | -82/+0 |
| |/ / | |||||
| * | | Merge pull request #12330 from owncloud/jenkins-eat-that | Morris Jobke | 2014-11-20 | 7 | -42/+40 |
| |\ \ | | | | | | | drop dependency of some commands on old config object | ||||
| | * | | drop dependency of some commands on old config object | Morris Jobke | 2014-11-20 | 7 | -42/+40 |
| | |/ | |||||
| * | | Merge pull request #12321 from owncloud/checkForXMLWriter | Thomas Müller | 2014-11-20 | 1 | -0/+1 |
| |\ \ | | | | | | | Check for XMLWriter class | ||||
| | * | | Check for XMLWriter class | Lukas Reschke | 2014-11-20 | 1 | -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 enabled | Vincent Petry | 2014-11-20 | 2 | -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-config | Morris Jobke | 2014-11-20 | 1 | -23/+29 |
| |\ \ \ | | | | | | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP... | ||||
| | * | | | replace double quotes with single quotes | Morris Jobke | 2014-11-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig | Morris Jobke | 2014-11-19 | 1 | -23/+29 |
| | | | | | |||||
| * | | | | Merge pull request #12325 from owncloud/removeunneccessarylang | Lukas Reschke | 2014-11-20 | 74 | -1417/+0 |
| |\ \ \ \ | |_|_|/ |/| | | | cleanup languages. closes #11274 | ||||
| | * | | | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 74 | -1417/+0 |
| | | | | | |||||
| * | | | | Merge pull request #12226 from owncloud/remove-phpass | Thomas Müller | 2014-11-20 | 6 | -17/+42 |
| |\ \ \ \ | | | | | | | | | | | Remove phpass and migrate to new Hasher interface | ||||
| | * | | | | Remove phpass and migrate to new Hasher interface | Lukas Reschke | 2014-11-17 | 6 | -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-testcase | Morris Jobke | 2014-11-20 | 187 | -359/+644 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Issue/10991 all testcase | ||||
| | * | | | | Make remaining files extend the test base | Joas Schilling | 2014-11-19 | 70 | -117/+191 |
| | | | | | | |||||
| | * | | | | Make root tests extend the \Test\TestCase | Joas Schilling | 2014-11-19 | 46 | -83/+160 |
| | | | | | | |||||
| | * | | | | Make apps/ extend the \Test\TestCase and fix overwritten methods | Joas Schilling | 2014-11-19 | 40 | -91/+161 |
| | | | | | | |||||
| | * | | | | Use base class to reset the file mapper | Joas Schilling | 2014-11-19 | 33 | -68/+132 |
| | | | | | | |||||
| * | | | | | Merge pull request #12305 from owncloud/sharelist-nodelete | Morris Jobke | 2014-11-20 | 2 | -12/+30 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove delete button in shared with others list | ||||
| | * | | | | | JSHint fixes in sharedfilelistSpec unit test file | Vincent Petry | 2014-11-19 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Remove delete button in shared with others list | Vincent Petry | 2014-11-19 | 2 | -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-12154 | Vincent Petry | 2014-11-20 | 6 | -14/+54 |
| |\ \ \ \ \ | | | | | | | | | | | | | Port 12154 | ||||
| | * | | | | | Add repair steps for legacy config files | Lukas Reschke | 2014-11-18 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php | ||||
| | * | | | | | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 4 | -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-loadtranslationsfromjs | Vincent Petry | 2014-11-20 | 3 | -2/+106 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added function to load translations from JS | ||||
| | * | | | | | | Fix l10n promises | Vincent Petry | 2014-11-19 | 2 | -6/+11 |
| | | | | | | | | |||||
| | * | | | | | | Better use of promise in OC.L10N.load() | Vincent Petry | 2014-11-19 | 1 | -13/+8 |
| | | | | | | | | |||||
| | * | | | | | | Remove stray generateUrl | Vincent Petry | 2014-11-19 | 1 | -5/+0 |
| | | | | | | | | |||||
| | * | | | | | | Added function to load translations from JS | Vincent Petry | 2014-11-18 | 3 | -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 transifex | Jenkins for ownCloud | 2014-11-20 | 174 | -774/+406 |
| | |_|_|/ / / |/| | | | | | |||||
| * | | | | | | Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2 | Lukas Reschke | 2014-11-19 | 1 | -0/+8 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Show warning when invalid user was passed | ||||
| | * | | | | | Show warning when invalid user was passed | Vincent Petry | 2014-11-14 | 1 | -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/addWarningToEncryptionLostPassword | Lukas Reschke | 2014-11-19 | 15 | -150/+388 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Warn for password reset when files_encryption is enabled | ||||
| | * | | | | | center spinner | Morris Jobke | 2014-11-18 | 2 | -1/+7 |
| | | | | | | | |||||
| | * | | | | | Show spinner | Lukas Reschke | 2014-11-17 | 2 | -0/+2 |
| | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |