summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Don't use an alert for displaying app-mgmt-errorskondou2013-08-183-10/+44
* Merge branch 'master' into improve_app-managementkondou2013-08-1810-36/+47
|\
| * Merge pull request #4476 from owncloud/doc-on-masterThomas Müller2013-08-171-2/+2
| |\
| | * fix difference between packaged version and masterMorris Jobke2013-08-171-2/+2
| * | remove ru_RU - fixes #3135Thomas Müller2013-08-172-12/+0
| |/
| * Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-161-14/+6
| |\
| | * merge master into css-fixesJan-Christoph Borchardt2013-08-1678-100/+427
| | |\
| | * | remove table layout for background jobsJan-Christoph Borchardt2013-07-311-14/+6
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-161-0/+9
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-132-0/+8
| * | Merge pull request #4344 from owncloud/appmgmt-in-navigationJan-Christoph Borchardt2013-08-093-8/+22
| |\ \
| | * | draw attention to the newly added app entry by flashing it twiceJan-Christoph Borchardt2013-08-071-0/+3
| | * | scroll the app navigation down so the newly added app is seenJan-Christoph Borchardt2013-08-071-0/+2
| | * | prepend the new app before the 'More apps' functionJan-Christoph Borchardt2013-08-071-1/+2
| | * | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-072-7/+15
* | | | Merge branch 'master' into improve_app-managementkondou2013-08-0975-76/+348
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0973-72/+334
| * | | Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-082-4/+4
| |\ \ \
| | * \ \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-2467-142/+223
| | |\ \ \
| | * | | | General CSS cleanupkondou2013-07-092-4/+4
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-071-0/+10
| | |_|/ / | |/| | |
* | | | | Log exception at the catching codekondou2013-08-091-0/+1
* | | | | Improve app-managementkondou2013-08-062-11/+18
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-041-0/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-032-0/+16
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-021-20/+20
* | | | Some styling to user listVictor Dubiniuk2013-08-011-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-011-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+4
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-302-0/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-291-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-283-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2752-318/+92
| |/ |/|
* | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-242-12/+8
* | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2439-78/+153
|\ \
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-247-0/+13
| * | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-2218-62/+62
| |\ \
| | * \ Merge pull request #2980 from owncloud/===_and_!==_in_settingsMorris Jobke2013-07-2218-62/+62
| | |\ \
| | | * | Use !== and === in settings.kondou2013-07-2118-62/+62
| * | | | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-2214-16/+64
| |\| | |
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-222-12/+13
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-211-0/+2
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-191-0/+1
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-183-2/+4
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-163-1/+33
| | * | Use transifex.com on link to translationsrolandgeider2013-07-141-1/+1
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-142-0/+7
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-132-0/+3
| * | | Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into di...Thomas Müller2013-07-141-2/+2
| |\ \ \
| | * | | change anonymous to publicThomas Mueller2013-07-121-2/+2