Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | DI IConfig into ldap helper | Roeland Jago Douma | 2016-10-10 | 26 | -27/+43 |
| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | Do not query data that is already in the appconfig | Roeland Jago Douma | 2016-10-10 | 1 | -23/+12 |
| | | | | | | This is already available. We better use a simple regex. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-10 | 28 | -40/+374 |
| | |||||
* | Merge pull request #1658 from nextcloud/fix-log.condition | Morris Jobke | 2016-10-09 | 1 | -1/+1 |
|\ | | | | | Default to empty string | ||||
| * | Default to empty string | Lukas Reschke | 2016-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Otherwise `null` is returned which leads to a ton of similar error messages if the log condition setting is enabled.: ``` {"reqId":"3wVBarnDfOV3qkI1bVCU","remoteAddr":"89.98.78.41","app":"PHP","message":"hash_equals(): Expected user_string to be a string, null given at \/var\/www\/html\/lib\/private\/Log.php#275","level":3,"time":"2016-10-07T14:22:15+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/","user":"icewind"} ``` | ||||
* | | Merge pull request #1665 from nextcloud/speed-up-is-subdirectory-test | Morris Jobke | 2016-10-09 | 3 | -43/+26 |
|\ \ | | | | | | | Simplify isSubDirectory check | ||||
| * | | Simplify isSubDirectory check | Lukas Reschke | 2016-10-07 | 3 | -43/+26 |
| |/ | | | | | | | | | | | Shaves off another 9ms per request as can be seen at https://blackfire.io/profiles/compare/dd54cef3-e58d-4a22-b8f4-c7c4b70697be/graph Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-09 | 14 | -2/+166 |
| | | |||||
* | | Merge pull request #1661 from nextcloud/fix_1659 | Lukas Reschke | 2016-10-08 | 1 | -3/+3 |
|\ \ | | | | | | | use older php array syntax in index.php | ||||
| * | | use older php array syntax in index.php | Georg Ehrke | 2016-10-07 | 1 | -3/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-08 | 80 | -70/+680 |
|/ / | |||||
* | | Merge pull request #1648 from nextcloud/bump_moment_js | Roeland Jago Douma | 2016-10-07 | 2 | -8/+9 |
|\ \ | | | | | | | Bump moment.js | ||||
| * | | Bump moment.js | Roeland Jago Douma | 2016-10-07 | 2 | -8/+9 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #1651 from nextcloud/fix_bower_strengthify | Lukas Reschke | 2016-10-07 | 3 | -4/+6 |
|\ \ \ | |_|/ |/| | | Fix bower.json for strengthify | ||||
| * | | Fix bower.json for strengthify | Roeland Jago Douma | 2016-10-07 | 3 | -4/+6 |
| |/ | | | | | | | | | | | Bower.json was still bound to the old version. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #1644 from nextcloud/apple-web-title | Morris Jobke | 2016-10-07 | 1 | -1/+1 |
|\ \ | | | | | | | Set proper web title for apple | ||||
| * | | Use name from theming | Joas Schilling | 2016-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | Set proper web title for apple | Roeland Jago Douma | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #1643 from nextcloud/ldap_more_caching | Morris Jobke | 2016-10-07 | 4 | -29/+180 |
|\ \ \ | |_|/ |/| | | cache loginName2UserName and cover the method with unit tests | ||||
| * | | cache loginName2UserName and cover the method with unit tests | Arthur Schiwon | 2016-10-07 | 4 | -12/+162 |
| | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | get rid of test warnings | Arthur Schiwon | 2016-10-06 | 1 | -21/+22 |
| |/ | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-07 | 102 | -118/+192 |
| | | |||||
* | | Merge pull request #1144 from nextcloud/translate-default-calendar | Morris Jobke | 2016-10-06 | 13 | -20/+97 |
|\ \ | | | | | | | translate default calendar & default address book displaynames & add … | ||||
| * | | Add transifex config | Morris Jobke | 2016-10-06 | 2 | -0/+6 |
| | | | |||||
| * | | Fix unit tests | Joas Schilling | 2016-10-06 | 3 | -11/+24 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Translate the Contacts addressbook when it's default | Joas Schilling | 2016-10-06 | 6 | -6/+57 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Translate the personal calendar | Joas Schilling | 2016-10-06 | 3 | -3/+10 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #1514 from nextcloud/integration-tests-orphaned-shares | Morris Jobke | 2016-10-06 | 5 | -33/+248 |
|\ \ \ | |_|/ |/| | | Integration tests orphaned shares + Prefilter inaccessible shares | ||||
| * | | Prefilter inaccessible shares in DefaultShareProvider::getSharedWith() | Vincent Petry | 2016-10-06 | 2 | -31/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DefaultShareProvider now does a DB-level check to find out whether file_source is accessible at all (deleted file) or whether it's in the trashbin of a home storage. One small corner case where the home storage id is in md5 form cannot be covered properly with this approach. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Adding type parameter because behat cannot ignore it | Sergio Bertolín | 2016-10-06 | 1 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Orphaned shares test and some requirements | Sergio Bertolín | 2016-10-06 | 3 | -1/+50 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #1629 from nextcloud/cleanup-settings-application | Joas Schilling | 2016-10-06 | 16 | -563/+535 |
|\ \ \ | | | | | | | | | Cleanup settings Application class | ||||
| * | | | Use our base class everywhere | Joas Schilling | 2016-10-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | phpunit min version is 4.8 | Joas Schilling | 2016-10-06 | 1 | -31/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Fix tests | Joas Schilling | 2016-10-06 | 8 | -286/+368 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Clean up core/Application a bit more | Joas Schilling | 2016-10-05 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Use magic DI as much as possible | Joas Schilling | 2016-10-05 | 5 | -217/+68 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | When we can not create the class, try if the variable is a registered service | Joas Schilling | 2016-10-05 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Remove unneeded service definitions | Joas Schilling | 2016-10-05 | 1 | -44/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Add a test for all the controllers and the middleware | Joas Schilling | 2016-10-05 | 1 | -0/+111 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #1453 from nextcloud/do-not-reload-if-connection-lost | Morris Jobke | 2016-10-06 | 2 | -2/+29 |
|\ \ \ \ | | | | | | | | | | | do not reload the page if the server is (temporarily) unreachable | ||||
| * | | | | do not reload the page if the server is (temporarily) unreachable | Christoph Wurst | 2016-10-03 | 2 | -2/+29 |
| | | | | | |||||
* | | | | | Merge pull request #1562 from nextcloud/log-version | Morris Jobke | 2016-10-06 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | log version number in each log line | ||||
| * | | | | | log version number in each log line | Morris Jobke | 2016-10-06 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | Merge pull request #1638 from nextcloud/allow-cross-repository-execution | Morris Jobke | 2016-10-06 | 10 | -11/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow to call the files even when you are in another instance atm | ||||
| * | | | | | | Allow to call the files even when you are in another instance atm | Joas Schilling | 2016-10-06 | 10 | -11/+11 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | Merge pull request #1616 from nextcloud/downstream_ldap_6 | Morris Jobke | 2016-10-06 | 1 | -0/+10 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Prevent user with empty uid | ||||
| * | | | | | Log the error with display name | Joas Schilling | 2016-10-06 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | Prevent user with empty uid | Jörn Friedrich Dreyer | 2016-10-04 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | | Merge pull request #1634 from nextcloud/fix-password-policy-hint | Joas Schilling | 2016-10-06 | 2 | -4/+49 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Properly catch password policy hint for personal page password changes |