summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Popover design fixes and settings updateJohn Molakvoæ (skjnldsv)2018-06-298-5/+143
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* adjust and reuse apps.css, makes additional class and rules unnecessaryArthur Schiwon2018-06-293-14/+4
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* CSS fixesArthur Schiwon2018-06-292-10/+12
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* do things with npm so make build-js-production succeeds without complaintsArthur Schiwon2018-06-295-31/+27
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* fix method declarationArthur Schiwon2018-06-291-2/+2
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adjust testsArthur Schiwon2018-06-295-2/+18
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* display whats new info in admin settingsArthur Schiwon2018-06-2911-12/+151
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #5623 from nextcloud/locale-settingMorris Jobke2018-06-2919-61/+808
|\ | | | | Add user locale/region setting
| * Update PHPDocMorris Jobke2018-06-291-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * docblock version fixesGeorg Ehrke2018-06-283-6/+6
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * Design fixesJohn Molakvoæ (skjnldsv)2018-06-284-7/+13
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * move locales file to /resources/Georg Ehrke2018-06-272-1/+1
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * fix use of findLocaleGeorg Ehrke2018-06-272-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * properly handle force_locale settingGeorg Ehrke2018-06-271-0/+5
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * cache available locales to minimize fs accessGeorg Ehrke2018-06-271-6/+23
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * fix camelCase for localesForLanguageGeorg Ehrke2018-06-272-2/+2
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * fix tests / mistakes made during rebaseGeorg Ehrke2018-06-273-20/+8
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * show locale example and apply new locale right awayGeorg Ehrke2018-06-273-1/+18
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * fix OC.getLocale()Georg Ehrke2018-06-271-1/+1
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * fix position of locale inputGeorg Ehrke2018-06-272-29/+29
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * OC.getLocale() now returns Locale and no longer LanguageThomas Citharel2018-06-274-3/+13
| | | | | | | | | | | | | | Added OC.getLanguage() to get Language <html lang=''> still gets language, though according to IETF BCP47 locale should be good. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * add findLocale() to public interfaceThomas Citharel2018-06-271-0/+7
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * handle config.php valuesThomas Citharel2018-06-273-5/+37
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * Fix review & testsThomas Citharel2018-06-277-17/+97
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Add testsThomas Citharel2018-06-271-37/+39
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Allow apps to specify locale for localisationThomas Citharel2018-06-273-13/+40
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * Allow user to choose localeThomas Citharel2018-06-275-1/+557
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #9773 from nextcloud/feature/noid/resource_bookingMorris Jobke2018-06-2935-16/+3160
|\ \ | | | | | | resource booking
| * | Call Backgroundjob with parameter, as interface requiresGeorg Ehrke2018-06-281-1/+1
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Calendar resource booking: unit tests / adding missing annotationsGeorg Ehrke2018-06-259-4/+505
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | update classloader/classmap for calendar resource booking changesGeorg Ehrke2018-06-254-0/+20
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | periodically query calendar resource / room backends for updated resource / ↵Georg Ehrke2018-06-2510-0/+419
| | | | | | | | | | | | | | | | | | room information Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | hook up calendar resource managers/backends with server containerGeorg Ehrke2018-06-252-0/+38
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | update resource booking interfaces and add managersGeorg Ehrke2018-06-258-14/+308
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | apply group restrictions to resourcesGeorg Ehrke2018-06-259-31/+1108
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | add resource / room principalsGeorg Ehrke2018-06-2513-14/+559
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | add resource and room interfacesGeorg Ehrke2018-06-254-0/+250
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #10043 from nextcloud/bugfix/noid/mergejs-css-varsMorris Jobke2018-06-291-0/+10
|\ \ \ | | | | | | | | Run mergejs to add css-vars-ponyfill
| * | | Run mergejs to add css-vars-ponyfillJulius Härtl2018-06-281-0/+10
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [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 cases
| * | | lower log level for quota manipulation casesArthur Schiwon2018-06-283-161/+127
| | | | | | | | | | | | | | | | | | | | | | | | and simplify the forest of ifs a little bit Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #10040 from ↵Roeland Jago Douma2018-06-281-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-filenames-in-sharing-integration-tests Fix filenames in sharing integration tests
| * | | | Check all paths for own files and sharesDaniel Calviño Sánchez2018-06-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "PARENT (2)" and its subdirectories to the paths to be checked, as before only the own "PARENT" folder was being checked, but not the shared one. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Fix filenames in sharing integration testsDaniel Calviño Sánchez2018-06-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file is shared and the receiver of the share already has a file with the same name that file is left untouched, and "(2)" is appended to the name of the shared file. As "textfile0.txt" is included in the user folder skeleton all the users in the integration test have that file, so when it is shared the receiver sees the share as "/textfile0 (2).txt", and her own file as "/textfile0.txt". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #10042 from ↵Roeland Jago Douma2018-06-281-15/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-variable-not-replaced-in-behat-yml-when-default-value-was-used Fix variable not replaced in "behat.yml" when default value was used
| * | | | | Fix variable not replaced in "behat.yml" when default value was usedDaniel Calviño Sánchez2018-06-281-15/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As "selenium.server" is a simulated variable it is not recognized by Mink, so it must be always replaced by its value in "behat.yml" before the file is parsed by Behat. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #10039 from ↵Morris Jobke2018-06-281-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/ci/noid/disable-codecov-status-and-comment Disable codecov status and comment
| * | | | | Disable codecov status and commentMorris Jobke2018-06-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | 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 parsed
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 19:00:49 +0000