summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move findLanguage() and setLanguageFromRequest() to factoryJoas Schilling2016-01-267-102/+166
|
* Move languageExists() to the factoryJoas Schilling2016-01-263-8/+27
|
* Move findAvailableLanguages() to the factoryJoas Schilling2016-01-265-21/+68
|
* Merge pull request #21901 from owncloud/fix-setupThomas Müller2016-01-261-5/+8
|\ | | | | Fix setup page
| * Fix setup pageMorris Jobke2016-01-261-5/+8
| | | | | | | | * fixes #21897
* | Merge pull request #21853 from owncloud/tags-fixpropertymaThomas Müller2016-01-262-4/+2
|\ \ | | | | | | Fix oc:tags tag list serializer
| * | Fix TagList serializerVincent Petry2016-01-221-3/+1
| | |
| * | Fix oc:tags tag list serializerVincent Petry2016-01-221-1/+1
| | | | | | | | | | | | Fixes propfind/proppatch of oc:tags
* | | Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-changeThomas Müller2016-01-265-21/+40
|\ \ \ | | | | | | | | Changing the avatar of the user emits the changeUser event which trig…
| * | | Trigger change on avatar deleteThomas Müller2016-01-252-1/+3
| | | |
| * | | Assert that User::triggerChange is called upon avatar changeThomas Müller2016-01-251-3/+7
| | | |
| * | | Changing the avatar of the user emits the changeUser event which triggers ↵Thomas Müller2016-01-255-21/+34
| | | | | | | | | | | | | | | | update of the system addressbook
* | | | Merge pull request #21894 from owncloud/refactor-csrfThomas Müller2016-01-2617-79/+764
|\ \ \ \ | | | | | | | | | | Add new CSRF manager for unit testing purposes
| * | | | Regenerate CSRF token upon loginLukas Reschke2016-01-251-0/+2
| | | | | | | | | | | | | | | | | | | | Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
| * | | | Add new CSRF manager for unit testing purposesLukas Reschke2016-01-2517-79/+762
| | | | | | | | | | | | | | | | | | | | This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf. Due to some of our required custom changes it is however not possible to use the Symfony component directly.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-26224-306/+90
| | | | |
* | | | | Merge pull request #21892 from owncloud/issue-21890-parametersThomas Müller2016-01-259-21/+64
|\ \ \ \ \ | |_|/ / / |/| | | | Add parameters types to IQueryBuilder
| * | | | Replace other usagesJoas Schilling2016-01-258-21/+25
| | | | |
| * | | | Add parameters to public interfaceJoas Schilling2016-01-251-0/+39
| | |_|/ | |/| |
* | | | Merge pull request #21885 from owncloud/add-size-minus-zero-to-avatarThomas Müller2016-01-253-18/+31
|\ \ \ \ | | | | | | | | | | Adding support of -1 as size to be passed into get and getFile
| * | | | Adding support of -1 as size to be passed into get and getFileThomas Müller2016-01-253-18/+31
| |/ / /
* | | | Merge pull request #21830 from owncloud/systemtags-sidebar-permissionsThomas Müller2016-01-259-249/+460
|\ \ \ \ | |/ / / |/| | | Systemtags sidebar permissions
| * | | System tags sidebar selector now respects permissionsVincent Petry2016-01-258-248/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For admins: display the namespace behind the tag name. For users: no namespace, don't display non-assignable tags in the dropdown, display already assigned non-assignable tags with a different style
| * | | Expose whether user is an admin through a methodVincent Petry2016-01-251-1/+13
|/ / / | | | | | | | | | Which is nicer than an obscure global variable
* | | Merge pull request #18444 from owncloud/occ-config-typesThomas Müller2016-01-256-73/+413
|\ \ \ | | | | | | | | occ config:system:set can now set other value types
| * | | Allow array recursion in getJoas Schilling2016-01-142-6/+31
| | | |
| * | | Allow deleting a nested system config valueJoas Schilling2016-01-143-16/+156
| | | |
| * | | Retain backwards compatibilityJoas Schilling2016-01-142-76/+71
| | | |
| * | | occ config:system:set can now set other value typesRobin McCorkell2016-01-142-52/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Integers, doubles, booleans and even arrays can now be set, with the --type=... option. Array setting can be specified by passing multiple name arguments, e.g. `./occ config:system:set redis port --value=123 --type=integer`
* | | | Merge pull request #21401 from owncloud/dav-cache-getchildrenThomas Müller2016-01-253-7/+32
|\ \ \ \ | | | | | | | | | | Put nodes from Directory->getChildren in the ObjectTree cache
| * | | | Put nodes from Directory->getChildren in the ObjectTree cacheRobin Appelman2016-01-173-7/+32
| | | | |
* | | | | Merge pull request #21424 from owncloud/appversionsThomas Müller2016-01-252-21/+11
|\ \ \ \ \ | | | | | | | | | | | | Use appConfig to get app versions
| * | | | | Faster AppConfig->getValuesRobin Appelman2016-01-111-7/+6
| | | | | |
| * | | | | Use appconfig for getAppVersionsRobin Appelman2016-01-111-14/+5
| | | | | |
* | | | | | Merge pull request #21806 from owncloud/mdusher-masterThomas Müller2016-01-251-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | [jenkins] Added ' to characters allowed in the username
| * | | | | | fix error message and commentMorris Jobke2016-01-201-2/+2
| | | | | | |
| * | | | | | Added ' to characters allowed in the usernameMichael U2016-01-201-2/+2
| | | | | | |
* | | | | | | Merge pull request #21811 from owncloud/fix-unauthenticated-avatarThomas Müller2016-01-251-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Show default placeholder if avatar image can't be fetched
| * | | | | | | Show default placeholder if avatar image can't be fetchedMorris Jobke2016-01-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes owncloud/documents#601 * ref #14564
* | | | | | | | Merge pull request #21844 from owncloud/drop-image-pathThomas Müller2016-01-258-37/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove OC_Helper::imagePath and use the proper public interface
| * | | | | | | | Remove OC_Helper::imagePath and use the proper public interfaceMorris Jobke2016-01-248-37/+25
| | | | | | | | |
* | | | | | | | | Merge pull request #21862 from owncloud/sync-certificates-with-upstreamThomas Müller2016-01-251-119/+60
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [master] Sync certificates with upstream
| * | | | | | | | | Sync certificates with upstreamLukas Reschke2016-01-221-119/+60
| | | | | | | | | |
* | | | | | | | | | Merge pull request #21878 from owncloud/fix-apps-management-templatingThomas Müller2016-01-251-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Include author and license in l10n string to be able to change order
| * | | | | | | | | | Includ author and license in l10n string to be able to change orderMorris Jobke2016-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #21874
* | | | | | | | | | | Merge pull request #21879 from owncloud/remove-unused-codeThomas Müller2016-01-251-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | remove unused variable
| * | | | | | | | | | remove unused variableMorris Jobke2016-01-251-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #21877 from owncloud/fix_dav_appLukas Reschke2016-01-251-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Add missing use statements for IGroupManager and IUserSession
| * | | | | | | | | Add missing use statements for IGroupManager and IUserSessionRoeland Jago Douma2016-01-251-0/+2
|/ / / / / / / / /
* | / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-2516-40/+86
| |/ / / / / / / |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 06:48:15 +0000