aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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.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.jsRoeland Jago Douma2016-10-072-8/+9
* | Merge pull request #1651 from nextcloud/fix_bower_strengthifyLukas Reschke2016-10-073-4/+6
|\ \
| * | Fix bower.json for strengthifyRoeland Jago Douma2016-10-073-4/+6
| |/
* | Merge pull request #1644 from nextcloud/apple-web-titleMorris Jobke2016-10-071-1/+1
|\ \
| * | Use name from themingJoas Schilling2016-10-071-1/+1
| * | Set proper web title for appleRoeland Jago Douma2016-10-061-1/+1
* | | Merge pull request #1643 from nextcloud/ldap_more_cachingMorris Jobke2016-10-074-29/+180
|\ \ \ | |_|/ |/| |
| * | cache loginName2UserName and cover the method with unit testsArthur Schiwon2016-10-074-12/+162
| * | get rid of test warningsArthur Schiwon2016-10-061-21/+22
| |/
* | [tx-robot] updated from transifexNextcloud bot2016-10-07102-118/+192
* | Merge pull request #1144 from nextcloud/translate-default-calendarMorris Jobke2016-10-0613-20/+97
|\ \
| * | Add transifex configMorris Jobke2016-10-062-0/+6
| * | Fix unit testsJoas Schilling2016-10-063-11/+24
| * | Translate the Contacts addressbook when it's defaultJoas Schilling2016-10-066-6/+57
| * | Translate the personal calendarJoas Schilling2016-10-063-3/+10
* | | Merge pull request #1514 from nextcloud/integration-tests-orphaned-sharesMorris Jobke2016-10-065-33/+248
|\ \ \ | |_|/ |/| |
| * | Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()Vincent Petry2016-10-062-31/+196
| * | Adding type parameter because behat cannot ignore itSergio Bertolín2016-10-061-2/+3
| * | Orphaned shares test and some requirementsSergio Bertolín2016-10-063-1/+50
* | | Merge pull request #1629 from nextcloud/cleanup-settings-applicationJoas Schilling2016-10-0616-563/+535
|\ \ \
| * | | Use our base class everywhereJoas Schilling2016-10-061-1/+2
| * | | phpunit min version is 4.8Joas Schilling2016-10-061-31/+1
| * | | Fix testsJoas Schilling2016-10-068-286/+368
| * | | Clean up core/Application a bit moreJoas Schilling2016-10-051-2/+0
| * | | Use magic DI as much as possibleJoas Schilling2016-10-055-217/+68
| * | | When we can not create the class, try if the variable is a registered serviceJoas Schilling2016-10-051-0/+3
| * | | Remove unneeded service definitionsJoas Schilling2016-10-051-44/+0
| * | | Add a test for all the controllers and the middlewareJoas Schilling2016-10-051-0/+111
* | | | 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) 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 lineMorris Jobke2016-10-061-2/+4
* | | | | | 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 atmJoas Schilling2016-10-0610-11/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1616 from nextcloud/downstream_ldap_6Morris Jobke2016-10-061-0/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Log the error with display nameJoas Schilling2016-10-061-2/+5
| * | | | | Prevent user with empty uidJörn Friedrich Dreyer2016-10-041-0/+7
* | | | | | Merge pull request #1634 from nextcloud/fix-password-policy-hintJoas Schilling2016-10-062-4/+49
|\ \ \ \ \ \
| * | | | | | Properly catch password policy hint for personal page password changesMorris Jobke2016-10-062-4/+49
* | | | | | | Merge pull request #1633 from nextcloud/update-root-certificate-listRoeland Jago Douma2016-10-061-84/+227
|\ \ \ \ \ \ \
| * | | | | | | Update root certificate listLukas Reschke2016-10-061-84/+227
| |/ / / / / /
* | | | | | | Merge pull request #1636 from nextcloud/downstream-26203-fix-synjob-class-nameMorris Jobke2016-10-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix SyncJob class name in info.xmlJoas Schilling2016-10-061-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1229 from nextcloud/bugfix/change-password-changesMorris Jobke2016-10-064-6/+25
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | remove old indicators for "saving started" and "saving successful"Morris Jobke2016-10-061-2/+0