summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9390 from owncloud/fix-9368Jan-Christoph Borchardt2014-07-031-2/+0
|\
| * Revert "hides table header while users load."Arthur Schiwon2014-07-021-2/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2014-07-031-0/+13
* | Merge pull request #9374 from owncloud/link-contribute-promoteJan-Christoph Borchardt2014-07-022-0/+15
|\ \ | |/ |/|
| * personal: link straight to /promote as @tomneedham saidJan-Christoph Borchardt2014-07-021-1/+1
| * add link to contribute and promote pages in personal settingsJan-Christoph Borchardt2014-07-022-0/+15
* | remove shadow effects from settings icons, reduce sizeJan-Christoph Borchardt2014-07-0210-35/+11
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-07-022-1/+5
* Merge pull request #9330 from owncloud/jumpingheadericewind19912014-07-011-0/+2
|\
| * hides table header while users load.raghunayyar2014-07-011-0/+2
* | Fixes typo with sendmail detection - fixes #9203Steffen Lindner2014-06-301-1/+1
|/
* Merge pull request #9207 from owncloud/prevent-default-for-mail-testJoas Schilling2014-06-302-4/+4
|\
| * Fix test mail behaviourMorris Jobke2014-06-252-4/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-304-1/+35
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-291-1/+12
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-281-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-273-11/+67
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-261-0/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-252-4/+8
* Merge pull request #9145 from owncloud/everyonecountblizzz2014-06-242-1/+4
|\
| * Better Logic to display user count for everyone.raghunayyar2014-06-242-1/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-242-0/+13
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-232-4/+9
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-223-2/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-201-0/+5
* Make sure last seen tooltip always appears even after searching and filteringArthur Schiwon2014-06-193-5/+16
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-193-11/+54
* [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
|\ \ \ \ \