summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #21782 from ↵Thomas Müller2016-01-211-6/+2
|\ | | | | | | | | owncloud/update-system-addressbook-on-user-change-2 Introduce IUser::setEMailAddress and add hook mechanism
| * 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
|\ | | | | Prevent group enable for apps
| * 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 ↵Jörn Friedrich Dreyer2016-01-141-0/+2
|/ | | | event dispatcher
* [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 sorting
| * Keep scroll position in users page when sortingVincent Petry2016-01-071-1/+8
| | | | | | | | | | | | | | | | When sorting, some browsers like Chrome will lose the scroll position, possibly because the sorting code is touching the DOM elements. This fix saves the scroll position before sorting and sets it back afterwards.
* | Merge pull request #21653 from owncloud/update-license-headers-2016Thomas Müller2016-01-1328-34/+38
|\ \ | | | | | | Update license headers 2016
| * | 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
|\ \ \ | | | | | | | | Allow admins to add system wide root certificates
| * | | 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
|\ \ | | | | | | improve personal page template
| * | 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 anchors
| * | 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
| | |
* | | Concat also the other resultsLukas Reschke2016-01-101-2/+2
| | | | | | | | | | | | Otherwise this will ignore the two last checks :speak_no_evil:
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1010-34/+166
| | |
* | | Merge pull request #21562 from owncloud/properly-check-for-well-known-redirectThomas Müller2016-01-091-0/+2
|\ \ \ | | | | | | | | Add check for .well-known URL in the root of the webservers URL
| * | | Add check for .well-known URL in the root of the webservers URLMorris Jobke2016-01-081-0/+2
| | | | | | | | | | | | | | | | * fixes #20012
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-098-40/+278
|/ / /
* | | fix warning box size for avatar changeMorris Jobke2016-01-081-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-088-0/+40
| | |
* | | Merge pull request #21506 from ↵Thomas Müller2016-01-072-0/+15
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue-20218-min-max-owncloud-version-warning Issue 20218 min max owncloud version warning
| * | | Add a warning on the apps list when the version is missingJoas Schilling2016-01-072-0/+15
| | |/ | |/|
* | | Allow searching apps by IDJoas Schilling2016-01-071-0/+5
| | |
* | | Fix users list dropdown position after scrollVincent Petry2016-01-071-0/+5
|/ / | | | | | | | | | | | | | | When scrolling, the position calculation of the multiselect dropdown was wrong. Adding "position: relative" to the list container makes the button calculation relative to it instead of the whole page. In this case the dropdown is properly aligned with the field regardless of scrolling.
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-07158-2032/+1628
| |
* | Merge pull request #20994 from owncloud/personal-pageThomas Müller2016-01-064-100/+147
|\ \ | | | | | | improve layout of personal settings page
| * | fix overlap and functionality of cropperJan-Christoph Borchardt2015-12-283-3/+19
| | |
| * | improve layout of personal settings pageJan-Christoph Borchardt2015-12-284-101/+132
| | |
* | | Inject OCSClientLukas Reschke2016-01-061-3/+3
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/21451
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-064-6/+10
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-042-0/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-022-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-012-0/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-3114-0/+18
| |