summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | OC.getLocale() now returns Locale and no longer LanguageThomas Citharel2018-06-274-3/+13
| * | | add findLocale() to public interfaceThomas Citharel2018-06-271-0/+7
| * | | handle config.php valuesThomas Citharel2018-06-273-5/+37
| * | | Fix review & testsThomas Citharel2018-06-277-17/+97
| * | | Add testsThomas Citharel2018-06-271-37/+39
| * | | Allow apps to specify locale for localisationThomas Citharel2018-06-273-13/+40
| * | | Allow user to choose localeThomas Citharel2018-06-275-1/+557
* | | | Merge pull request #9773 from nextcloud/feature/noid/resource_bookingMorris Jobke2018-06-2935-16/+3160
|\ \ \ \
| * | | | Call Backgroundjob with parameter, as interface requiresGeorg Ehrke2018-06-281-1/+1
| * | | | Calendar resource booking: unit tests / adding missing annotationsGeorg Ehrke2018-06-259-4/+505
| * | | | update classloader/classmap for calendar resource booking changesGeorg Ehrke2018-06-254-0/+20
| * | | | periodically query calendar resource / room backends for updated resource / r...Georg Ehrke2018-06-2510-0/+419
| * | | | hook up calendar resource managers/backends with server containerGeorg Ehrke2018-06-252-0/+38
| * | | | update resource booking interfaces and add managersGeorg Ehrke2018-06-258-14/+308
| * | | | apply group restrictions to resourcesGeorg Ehrke2018-06-259-31/+1108
| * | | | add resource / room principalsGeorg Ehrke2018-06-2513-14/+559
| * | | | add resource and room interfacesGeorg Ehrke2018-06-254-0/+250
* | | | | Merge pull request #10043 from nextcloud/bugfix/noid/mergejs-css-varsMorris Jobke2018-06-291-0/+10
|\ \ \ \ \
| * | | | | Run mergejs to add css-vars-ponyfillJulius Härtl2018-06-281-0/+10
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-2932-0/+50
* | | | | | Merge pull request #10034 from nextcloud/fix/noid/ldap-silence-quota-logmsgsblizzz2018-06-283-161/+127
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | lower log level for quota manipulation casesArthur Schiwon2018-06-283-161/+127
* | | | | | Merge pull request #10040 from nextcloud/fix-filenames-in-sharing-integration...Roeland Jago Douma2018-06-281-4/+10
|\ \ \ \ \ \
| * | | | | | Check all paths for own files and sharesDaniel Calviño Sánchez2018-06-281-1/+7
| * | | | | | Fix filenames in sharing integration testsDaniel Calviño Sánchez2018-06-281-3/+3
* | | | | | | Merge pull request #10042 from nextcloud/fix-variable-not-replaced-in-behat-y...Roeland Jago Douma2018-06-281-15/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix variable not replaced in "behat.yml" when default value was usedDaniel Calviño Sánchez2018-06-281-15/+13
| |/ / / / / /
* | | | | | | Merge pull request #10039 from nextcloud/ci/noid/disable-codecov-status-and-c...Morris Jobke2018-06-281-3/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Disable codecov status and commentMorris Jobke2018-06-281-3/+4
* | | | | | | Merge pull request #10036 from nextcloud/feature/9221/show-path-in-logRoeland Jago Douma2018-06-281-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Log path of file that failed to be parsedMorris Jobke2018-06-281-1/+1
| |/ / / / /
* | | | | | Merge pull request #10031 from nextcloud/fix/9987/ldap-backupserver-connectMorris Jobke2018-06-282-11/+54
|\ \ \ \ \ \
| * | | | | | LDAP backup server should not be queried when auth failsArthur Schiwon2018-06-272-11/+54
| | |/ / / / | |/| | | |
* / | | | | [tx-robot] updated from transifexNextcloud bot2018-06-2864-40/+62
|/ / / / /
* | | | | Merge pull request #10020 from nextcloud/bugfix/spreed-1007/email-address-mis...Roeland Jago Douma2018-06-271-2/+2
|\ \ \ \ \
| * | | | | Fix "parsing" of email-addresses in comments and chat messagesJoas Schilling2018-06-271-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #10018 from nextcloud/rakekniven-patch-2Roeland Jago Douma2018-06-273-3/+3
|\ \ \ \ \
| * | | | | Compile appMorris Jobke2018-06-272-2/+2
| * | | | | Update root.vuerakekniven2018-06-271-1/+1
* | | | | | Merge pull request #10027 from nextcloud/feature/noid/settings-groupwareMorris Jobke2018-06-274-6/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add groupware settings sectionJulius Härtl2018-06-274-6/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #10023 from nextcloud/bugfix/noid/class-name-already-in-useMorris Jobke2018-06-271-4/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use the correct Base classJoas Schilling2018-06-271-4/+0
|/ / / /
* | | | Merge pull request #10016 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-06-272-10/+10
|\ \ \ \
| * | | | Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibilitydependabot[bot]2018-06-272-10/+10
| |/ / /
* | | | Merge pull request #10013 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-06-272-16/+11
|\ \ \ \
| * | | | Bump webpack from 4.12.1 to 4.12.2 in /apps/oauth2dependabot[bot]2018-06-272-16/+11
| |/ / /
* | | | Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-h...Morris Jobke2018-06-2713-109/+45
|\ \ \ \
| * | | | Do not use HTTP code OC_Response constants anymoreMorris Jobke2018-06-265-26/+16
| * | | | Replace hardcoded status headers with calls to http_response_code()Morris Jobke2018-06-2612-83/+29