summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-185-0/+111
|\
| * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1781-122/+464
| |\
| * | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-121-7/+1
| * | only show decrypt all files option if encrypted files are availableBjoern Schiessle2013-07-301-2/+1
| * | improved error handlingBjoern Schiessle2013-07-301-4/+8
| * | working decrypt files methodBjoern Schiessle2013-07-294-19/+76
| * | add decryptall.phpBjörn Schießle2013-07-291-0/+14
| * | register decrypt all routeBjörn Schießle2013-07-291-0/+2
| * | add ajax call to decrypt all filesBjörn Schießle2013-07-292-1/+14
| * | user interface to allow user to decrypt all his files once the encryption app...Björn Schießle2013-07-292-0/+28
* | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-184-4/+4
|\ \ \
| * | | Add _many_ newlines at the end of fileskondou2013-08-184-4/+4
| | |/ | |/|
* | | Add trailing comma for all touched array lines.Andreas Fischer2013-08-171-1/+1
* | | Fix spacing of all touched lines.Andreas Fischer2013-08-172-2/+2
* | | Compare result are already true/falseBart Visscher2013-08-172-2/+2
|/ /
* | 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
* | | | [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
| |_|/ / / |/| | | |
* | | | | [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
| |\| | |