summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-032-0/+2
* Merge pull request #22054 from vincchan/vincchan/fix#20199Thomas Müller2016-02-022-4/+4
|\
| * Move data protection check to javascriptVincent Chan2016-02-012-4/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-022-0/+4
|/
* Merge pull request #21953 from owncloud/make-enable_avatars-more-robustThomas Müller2016-02-012-2/+2
|\
| * Make enable_avatars setting more robustMorris Jobke2016-01-272-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-012-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-316-2/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-302-0/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-296-4/+12
|/
* Merge pull request #21741 from owncloud/l10n-improvementsThomas Müller2016-01-272-2/+2
|\
| * Move findAvailableLanguages() to the factoryJoas Schilling2016-01-262-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2712-0/+22
* | Merge pull request #21912 from owncloud/issue-21908-trashbin-flickeringThomas Müller2016-01-262-10/+9
|\ \
| * | Hide the delete button, until we know its a custom avatarJoas Schilling2016-01-262-10/+9
| |/
* / fix first run wizard button not wrappingJan-Christoph Borchardt2016-01-261-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-26134-214/+0
* Includ author and license in l10n string to be able to change orderMorris Jobke2016-01-251-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-252-10/+10
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-232-2/+2
* Add a default app icon for apps that don't have oneJoas Schilling2016-01-221-0/+5
* Merge pull request #21782 from owncloud/update-system-addressbook-on-user-cha...Thomas Müller2016-01-211-6/+2
|\
| * Introduce IUser::setEMailAddress and add hook mechanismThomas Müller2016-01-201-6/+2
* | remove unneeded margin of app dependencies in app mgmtJan-Christoph Borchardt2016-01-201-1/+0
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-204-12/+86
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-182-0/+22
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-176-2/+22
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-162-0/+34
* Merge pull request #21723 from owncloud/prevent-group-enable-for-appsThomas Müller2016-01-151-1/+2
|\
| * Add a new app type that can not be enabled for groupsJoas Schilling2016-01-141-1/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-152-0/+26
* | allow apps to load additional scripts on the user settings page via the event...Jörn Friedrich Dreyer2016-01-141-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-1418-0/+22
* Merge pull request #21509 from owncloud/users-scrolltopThomas Müller2016-01-131-1/+8
|\
| * Keep scroll position in users page when sortingVincent Petry2016-01-071-1/+8
* | Merge pull request #21653 from owncloud/update-license-headers-2016Thomas Müller2016-01-1328-34/+38
|\ \
| * | Happy new year!Thomas Müller2016-01-1228-34/+38
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-13128-780/+710
* | | Merge pull request #21336 from owncloud/system-root-certsThomas Müller2016-01-129-132/+202
|\ \ \
| * | | Add a config option to enable certificate managementRobin Appelman2016-01-121-6/+8
| * | | Allow admins to add system wide root certificatesRobin Appelman2016-01-129-132/+200
| |/ /
* / / Add config switch to disable the .well-known URL checkMorris Jobke2016-01-123-3/+4
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-122-0/+22
* | Merge pull request #21608 from owncloud/better-setting-templatesThomas Müller2016-01-111-23/+5
|\ \
| * | Fix typesJoas Schilling2016-01-111-2/+2
| * | Fix table markupJoas Schilling2016-01-111-21/+3
* | | Merge pull request #21438 from owncloud/settings-anchorsThomas Müller2016-01-112-2/+2
|\ \ \ | |/ / |/| |
| * | remove unneeded 'goto' prefix from settings anchorsJan-Christoph Borchardt2016-01-042-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-116-158/+232
* | | remove extra slogan footer from Personal and Admin pagesJan-Christoph Borchardt2016-01-112-11/+7