Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 70 | -34/+282 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 25 | -0/+65 |
| * | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 4 | -7/+10 |
| |\ | |||||
| | * | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 81 | -129/+441 |
| | |\ | |||||
| | * | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -1/+3 |
| | * | | Fix some JSLint warnings | kondou | 2013-07-31 | 4 | -7/+8 |
| * | | | Merge pull request #4447 from owncloud/fix_4351_master | Morris Jobke | 2013-08-20 | 4 | -22/+29 |
| |\ \ \ | |||||
| | * | | | Break long lines into smaller ones. | Owen Winkler | 2013-08-18 | 1 | -3/+10 |
| | * | | | Use JSON to send/receive group data. | Owen Winkler | 2013-08-15 | 4 | -22/+22 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 35 | -0/+62 |
| * | | | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 5 | -0/+111 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 81 | -122/+464 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | check if some encrypted files are left after the app was disabled and warn th... | Bjoern Schiessle | 2013-08-12 | 1 | -7/+1 |
| | * | | | | only show decrypt all files option if encrypted files are available | Bjoern Schiessle | 2013-07-30 | 1 | -2/+1 |
| | * | | | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -4/+8 |
| | * | | | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 4 | -19/+76 |
| | * | | | | add decryptall.php | Björn Schießle | 2013-07-29 | 1 | -0/+14 |
| | * | | | | register decrypt all route | Björn Schießle | 2013-07-29 | 1 | -0/+2 |
| | * | | | | add ajax call to decrypt all files | Björn Schießle | 2013-07-29 | 2 | -1/+14 |
| | * | | | | user interface to allow user to decrypt all his files once the encryption app... | Björn Schießle | 2013-07-29 | 2 | -0/+28 |
| * | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 4 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 4 | -4/+4 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Add trailing comma for all touched array lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| * | | | | | Fix spacing of all touched lines. | Andreas Fischer | 2013-08-17 | 2 | -2/+2 |
| * | | | | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 2 | -2/+2 |
| |/ / / / | |||||
* | | | | | Move .errormsg from settings-css to .warning in core. Reusable! | kondou | 2013-08-18 | 3 | -14/+6 |
* | | | | | Use appitem instead of always recreating a jquery object | kondou | 2013-08-18 | 1 | -15/+13 |
* | | | | | Don't use an alert for displaying app-mgmt-errors | kondou | 2013-08-18 | 3 | -10/+44 |
* | | | | | Merge branch 'master' into improve_app-management | kondou | 2013-08-18 | 10 | -36/+47 |
|\| | | | | |||||
| * | | | | Merge pull request #4476 from owncloud/doc-on-master | Thomas Müller | 2013-08-17 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | fix difference between packaged version and master | Morris Jobke | 2013-08-17 | 1 | -2/+2 |
| * | | | | | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 2 | -12/+0 |
| |/ / / / | |||||
| * | | | | Merge pull request #4314 from owncloud/css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 1 | -14/+6 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 78 | -100/+427 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | remove table layout for background jobs | Jan-Christoph Borchardt | 2013-07-31 | 1 | -14/+6 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 1 | -0/+9 |
| | |/ / / | |/| | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-13 | 2 | -0/+8 |
| * | | | | Merge pull request #4344 from owncloud/appmgmt-in-navigation | Jan-Christoph Borchardt | 2013-08-09 | 3 | -8/+22 |
| |\ \ \ \ | |||||
| | * | | | | draw attention to the newly added app entry by flashing it twice | Jan-Christoph Borchardt | 2013-08-07 | 1 | -0/+3 |
| | * | | | | scroll the app navigation down so the newly added app is seen | Jan-Christoph Borchardt | 2013-08-07 | 1 | -0/+2 |
| | * | | | | prepend the new app before the 'More apps' function | Jan-Christoph Borchardt | 2013-08-07 | 1 | -1/+2 |
| | * | | | | show 'More apps' link to app administration directly in app navigation | Jan-Christoph Borchardt | 2013-08-07 | 2 | -7/+15 |
* | | | | | | Merge branch 'master' into improve_app-management | kondou | 2013-08-09 | 75 | -76/+348 |
|\| | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-09 | 73 | -72/+334 |
| * | | | | | Merge pull request #3912 from owncloud/css_cleanup_kondou | Jan-Christoph Borchardt | 2013-08-08 | 2 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into css_cleanup_kondou | kondou | 2013-07-24 | 67 | -142/+223 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | General CSS cleanup | kondou | 2013-07-09 | 2 | -4/+4 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-07 | 1 | -0/+10 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Log exception at the catching code | kondou | 2013-08-09 | 1 | -0/+1 |
* | | | | | | | Improve app-management | kondou | 2013-08-06 | 2 | -11/+18 |
|/ / / / / / |