summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-01-2884-286/+550
* Merge pull request #2822 from nextcloud/add-navigation-via-info.xmlMorris Jobke2017-01-276-20/+188
|\
| * Force to specify the nameJoas Schilling2017-01-273-8/+14
| * remove unused parameters and add viewBoxMorris Jobke2017-01-021-1/+1
| * Add navigation via info.xml (#26785)Thomas Müller2016-12-226-20/+182
* | Merge pull request #3178 from nextcloud/default-value-logdateformatJoas Schilling2017-01-273-4/+6
|\ \
| * | add comment about ISO 8601 and PHP 🙈Morris Jobke2017-01-231-1/+3
| * | fix default value for logdateformat - fixes #3107Morris Jobke2017-01-193-4/+4
* | | Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitiveLukas Reschke2017-01-271-1/+1
|\ \ \
| * | | Make sure different webroots use different cached pathsJoas Schilling2017-01-121-1/+1
* | | | Merge pull request #3284 from nextcloud/remove-avatar-fixupMorris Jobke2017-01-265-309/+0
|\ \ \ \
| * | | | remote now unneeded AvatarPermissions repair stepRobin Appelman2017-01-265-309/+0
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2728-8/+370
* | | | | Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bugMorris Jobke2017-01-262-6/+10
|\ \ \ \ \
| * | | | | fix shared-as-busy events for ownerGeorg Ehrke2017-01-262-6/+10
| |/ / / /
* | | | | Merge pull request #3249 from nextcloud/add-clear-search-buttonMorris Jobke2017-01-265-20/+54
|\ \ \ \ \
| * | | | | Js magic to reset searchJohn Molakvoæ (skjnldsv)2017-01-261-0/+4
| * | | | | properly compress close-white.svgJan-Christoph Borchardt2017-01-251-12/+3
| * | | | | Scour optJohn Molakvoæ (skjnldsv)2017-01-251-41/+12
| * | | | | Add clear search buttonJohn Molakvoæ (skjnldsv)2017-01-254-20/+88
* | | | | | Merge pull request #3246 from nextcloud/fix-sqlite-dependencyMorris Jobke2017-01-262-19/+5
|\ \ \ \ \ \
| * | | | | | Remove useless dependency on SQLite (non-PDO)Morris Jobke2017-01-252-19/+5
* | | | | | | Merge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-no...Lukas Reschke2017-01-261-0/+21
|\ \ \ \ \ \ \
| * | | | | | | Use correct theming when returning the defaultsJoas Schilling2017-01-191-0/+21
* | | | | | | | Merge pull request #3238 from nextcloud/dav-testLukas Reschke2017-01-262-5/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Make DAV external storage test more reliableRobin Appelman2017-01-242-5/+9
* | | | | | | | | Merge pull request #3272 from nextcloud/fix_user_controllerLukas Reschke2017-01-262-36/+83
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | make sure that 'getCurrentUser' gets an array in order to manipulate the data...Bjoern Schiessle2017-01-262-36/+83
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3160 from nextcloud/streams52Roeland Jago Douma2017-01-2611-57/+135
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update icewind/streams to 0.5.2Robin Appelman2017-01-2611-57/+135
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3265 from nextcloud/brute-force-protection-public-link-authLukas Reschke2017-01-261-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | add brute force protection for public link authenticationBjoern Schiessle2017-01-251-0/+1
* | | | | | | | | Merge pull request #3264 from nextcloud/ldap-deny-long-dnsMorris Jobke2017-01-263-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Gracefully deny users or groups with too long DNsArthur Schiwon2017-01-253-1/+16
* | | | | | | | | | Merge pull request #3197 from nextcloud/enable-scss-for-all-appsMorris Jobke2017-01-252-10/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Appdata var fixJohn Molakvoæ (skjnldsv)2017-01-241-1/+1
| * | | | | | | | | | Remove unused webrootJohn Molakvoæ (skjnldsv)2017-01-241-3/+2
| * | | | | | | | | | Enable every app to generate their scss fileJohn Molakvoæ (skjnldsv)2017-01-222-9/+12
* | | | | | | | | | | Merge pull request #3162 from nextcloud/ldap-ocsMorris Jobke2017-01-259-19/+545
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove outdated scenarioArthur Schiwon2017-01-201-6/+0
| * | | | | | | | | | | fix deletion for configIDs < s10Arthur Schiwon2017-01-201-14/+12
| * | | | | | | | | | | LDAP PUT command now supports setting multiple keys at onceArthur Schiwon2017-01-203-36/+41
| * | | | | | | | | | | enable user_ldap app for testsArthur Schiwon2017-01-202-1/+2
| * | | | | | | | | | | fix indentationMorris Jobke2017-01-191-9/+9
| * | | | | | | | | | | also, let ldap integration tests runArthur Schiwon2017-01-191-0/+10
| * | | | | | | | | | | LDAP OCS Api for show configArthur Schiwon2017-01-194-0/+136
| * | | | | | | | | | | test against OCS v2 insteadArthur Schiwon2017-01-192-19/+13
| * | | | | | | | | | | add LDAP OCS Api for modifying a configurationArthur Schiwon2017-01-194-11/+101
| * | | | | | | | | | | fix and extend behat testsArthur Schiwon2017-01-194-3/+77
| * | | | | | | | | | | LDAP OCS Api for delete configArthur Schiwon2017-01-183-0/+66