summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-1813-8/+109
* Migrate table layout to p layout for share settingsMorris Jobke2014-06-173-56/+49
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-171-0/+3
* Merge pull request #9059 from owncloud/simplify-warning-layoutVolkan Gezer2014-06-161-2/+4
|\
| * simplify security warning on admin pageMorris Jobke2014-06-161-2/+4
* | Merge pull request #9053 from owncloud/small_ux_improvementMorris Jobke2014-06-161-1/+2
|\ \ | |/ |/|
| * show explenation only if the setting is activatedBjoern Schiessle2014-06-161-1/+2
* | Merge pull request #8808 from owncloud/update_shipped_apps_from_appstoreGeorg Ehrke2014-06-167-9/+111
|\ \ | |/ |/|
| * skip certain tests for shipped appsGeorg Ehrke2014-06-131-1/+4
| * Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-06-0591-1012/+2192
| |\
| * | add unit testGeorg Ehrke2014-06-041-1/+1
| * | remove console.log in apps.jsGeorg Ehrke2014-06-041-1/+0
| * | various fixes as requested by pr reviewersGeorg Ehrke2014-06-023-6/+4
| * | add button for properly uninstalling appsGeorg Ehrke2014-05-313-0/+31
| * | Merge branch 'master' into update_shipped_apps_from_appstoreGeorg Ehrke2014-05-3169-345/+912
| |\ \
| * | | make it possible to update shipped apps via the appstoreGeorg Ehrke2014-05-314-9/+80
* | | | styleArthur Schiwon2014-06-161-2/+2
* | | | escape before output, fixes #9041Arthur Schiwon2014-06-161-1/+1
* | | | Merge pull request #8716 from owncloud/forget-documentationVolkan Gezer2014-06-161-1/+16
|\ \ \ \
| * | | | app manager forgets the documentation linksVolkan Gezer2014-06-061-1/+16
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-162-2/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-153-1/+6
* | | | | Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-httpsLukas Reschke2014-06-141-29/+25
|\ \ \ \ \
| * | | | | migrate table layout to paragraph layout for HTTPS settingMorris Jobke2014-06-131-29/+25
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-142-4/+4
* | | | | | remove double spaceMorris Jobke2014-06-141-1/+1
* | | | | | fix mail settings save function - ref #8854Morris Jobke2014-06-131-2/+2
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-135-0/+42
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1211-0/+42
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-1158-91/+44
* | | | | Merge pull request #8908 from owncloud/fix-placeholdersMorris Jobke2014-06-103-5/+5
|\ \ \ \ \
| * | | | | fix split translationsVolkan Gezer2014-06-063-5/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-102-5/+12
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-093-4/+96
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-086-18/+116
* | | | | | fix hidden user group search fieldVolkan Gezer2014-06-071-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0712-2/+45
* | | | | | unify controls bar, remove duplicate from user managementJan-Christoph Borchardt2014-06-062-12/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #8159 from owncloud/mobile-sidebar-swipeThomas Müller2014-06-061-1/+1
|\ \ \ \ \
| * | | | | slightly widen sidebar to 250px, works better with apps and on mobileJan-Christoph Borchardt2014-06-051-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #8911 from owncloud/common-langJan-Christoph Borchardt2014-06-061-1/+1
|\ \ \ \ \
| * | | | | Add Turkish to common languagesVolkan Gezer2014-06-051-1/+1
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0653-309/+98
|/ / / /
* | | | unify share settingsBjoern Schiessle2014-06-052-7/+4
* | | | This settings doesn't belong togetherBjoern Schiessle2014-06-052-11/+10
* | | | improve share settings workingBjoern Schiessle2014-06-051-5/+2
|/ / /
* | | Merge pull request #8620 from owncloud/design-navigation-twoThomas Müller2014-06-053-10/+15
|\ \ \
| * | | fix leading decimal Scrutinizer coding style issueJan-Christoph Borchardt2014-06-051-3/+3
| * | | add to app navigation after enablingMorris Jobke2014-06-041-8/+10
| * | | fix related layout issues in user managementJan-Christoph Borchardt2014-06-042-2/+5