aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve_app-managementkondou2013-08-2170-34/+282
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-2125-0/+65
| * Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-204-7/+10
| |\
| | * Merge branch 'master' into fix_jslint_kondoukondou2013-08-1881-129/+441
| | |\
| | * | Fix a syntax error & have if-conds in an own linekondou2013-08-011-1/+3
| | * | Fix some JSLint warningskondou2013-07-314-7/+8
| * | | Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-204-22/+29
| |\ \ \
| | * | | Break long lines into smaller ones.Owen Winkler2013-08-181-3/+10
| | * | | Use JSON to send/receive group data.Owen Winkler2013-08-154-22/+22
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1935-0/+62
| * | | | 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
| |/ / / /
* | | | | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-183-14/+6
* | | | | Use appitem instead of always recreating a jquery objectkondou2013-08-181-15/+13
* | | | | 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
|/ / / / / /