aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DI IConfig into ldap helperRoeland Jago Douma2016-10-1026-27/+43
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Do not query data that is already in the appconfigRoeland Jago Douma2016-10-101-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 transifexNextcloud bot2016-10-1028-40/+374
|
* Merge pull request #1658 from nextcloud/fix-log.conditionMorris Jobke2016-10-091-1/+1
|\ | | | | Default to empty string
| * Default to empty stringLukas Reschke2016-10-071-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-testMorris Jobke2016-10-093-43/+26
|\ \ | | | | | | Simplify isSubDirectory check
| * | Simplify isSubDirectory checkLukas Reschke2016-10-073-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 transifexNextcloud bot2016-10-0914-2/+166
| |
* | Merge pull request #1661 from nextcloud/fix_1659Lukas Reschke2016-10-081-3/+3
|\ \ | | | | | | use older php array syntax in index.php
| * | use older php array syntax in index.phpGeorg Ehrke2016-10-071-3/+3
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-10-0880-70/+680
|/ /
* | Merge pull request #1648 from nextcloud/bump_moment_jsRoeland Jago Douma2016-10-072-8/+9
|\ \ | | | | | | Bump moment.js
| * | Bump moment.jsRoeland Jago Douma2016-10-072-8/+9
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1651 from nextcloud/fix_bower_strengthifyLukas Reschke2016-10-073-4/+6
|\ \ \ | |_|/ |/| | Fix bower.json for strengthify
| * | Fix bower.json for strengthifyRoeland Jago Douma2016-10-073-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-titleMorris Jobke2016-10-071-1/+1
|\ \ | | | | | | Set proper web title for apple
| * | Use name from themingJoas Schilling2016-10-071-1/+1
| | |
| * | Set proper web title for appleRoeland Jago Douma2016-10-061-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1643 from nextcloud/ldap_more_cachingMorris Jobke2016-10-074-29/+180
|\ \ \ | |_|/ |/| | cache loginName2UserName and cover the method with unit tests
| * | cache loginName2UserName and cover the method with unit testsArthur Schiwon2016-10-074-12/+162
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | get rid of test warningsArthur Schiwon2016-10-061-21/+22
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2016-10-07102-118/+192
| |
* | Merge pull request #1144 from nextcloud/translate-default-calendarMorris Jobke2016-10-0613-20/+97
|\ \ | | | | | | translate default calendar & default address book displaynames & add …
| * | Add transifex configMorris Jobke2016-10-062-0/+6
| | |
| * | Fix unit testsJoas Schilling2016-10-063-11/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Translate the Contacts addressbook when it's defaultJoas Schilling2016-10-066-6/+57
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Translate the personal calendarJoas Schilling2016-10-063-3/+10
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1514 from nextcloud/integration-tests-orphaned-sharesMorris Jobke2016-10-065-33/+248
|\ \ \ | |_|/ |/| | Integration tests orphaned shares + Prefilter inaccessible shares
| * | Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()Vincent Petry2016-10-062-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 itSergio Bertolín2016-10-061-2/+3
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Orphaned shares test and some requirementsSergio Bertolín2016-10-063-1/+50
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #1629 from nextcloud/cleanup-settings-applicationJoas Schilling2016-10-0616-563/+535
|\ \ \ | | | | | | | | Cleanup settings Application class
| * | | Use our base class everywhereJoas Schilling2016-10-061-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | phpunit min version is 4.8Joas Schilling2016-10-061-31/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix testsJoas Schilling2016-10-068-286/+368
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Clean up core/Application a bit moreJoas Schilling2016-10-051-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use magic DI as much as possibleJoas Schilling2016-10-055-217/+68
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | When we can not create the class, try if the variable is a registered serviceJoas Schilling2016-10-051-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Remove unneeded service definitionsJoas Schilling2016-10-051-44/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add a test for all the controllers and the middlewareJoas Schilling2016-10-051-0/+111
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #1453 from nextcloud/do-not-reload-if-connection-lostMorris Jobke2016-10-062-2/+29
|\ \ \ \ | | | | | | | | | | do not reload the page if the server is (temporarily) unreachable
| * | | | do not reload the page if the server is (temporarily) unreachableChristoph Wurst2016-10-032-2/+29
| | | | |
* | | | | Merge pull request #1562 from nextcloud/log-versionMorris Jobke2016-10-061-2/+4
|\ \ \ \ \ | | | | | | | | | | | | log version number in each log line
| * | | | | log version number in each log lineMorris Jobke2016-10-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #1638 from nextcloud/allow-cross-repository-executionMorris Jobke2016-10-0610-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 atmJoas Schilling2016-10-0610-11/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #1616 from nextcloud/downstream_ldap_6Morris Jobke2016-10-061-0/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Prevent user with empty uid
| * | | | | Log the error with display nameJoas Schilling2016-10-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Prevent user with empty uidJörn Friedrich Dreyer2016-10-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #1634 from nextcloud/fix-password-policy-hintJoas Schilling2016-10-062-4/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Properly catch password policy hint for personal page password changes