| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 4 | -2/+12 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 6 | -5/+138 |
| | | |||||
| * | no duplicate declaration of appLicense + camelCase | Thomas Müller | 2013-08-28 | 1 | -5/+4 |
| | | |||||
| * | Work around #4630 to fix license showing | kondou | 2013-08-28 | 1 | -1/+10 |
| | | |||||
| * | Merge pull request #4563 from owncloud/use_personal-password | Jan-Christoph Borchardt | 2013-08-28 | 2 | -2/+2 |
| |\ | | | | | Use personal-password for the password name in personal.php | ||||
| | * | Use personal-password for the password name in personal.php | kondou | 2013-08-24 | 2 | -2/+2 |
| | | | | | | | | | Fix #4491 | ||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 4 | -0/+19 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 11 | -5/+34 |
| | | | |||||
| * | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 1 | -118/+0 |
| |\ \ | | | | | | | kill zh_CN.GB2312 | ||||
| | * | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -118/+0 |
| | | | | |||||
| * | | | storage information is path specific | Thomas Müller | 2013-08-27 | 1 | -1/+1 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 58 | -163/+114 |
| | | | |||||
| * | | Merge pull request #4331 from owncloud/improve_app-management | Christopher | 2013-08-25 | 4 | -22/+54 |
| |\ \ | |/ |/| | Improve app-management | ||||
| | * | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 70 | -34/+282 |
| | |\ | | | | | | | | | | | | | Conflicts: settings/js/apps.js | ||||
| | * | | 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 |
| | | | | | | | | | | | | | Also fix some wrong data storages | ||||
| | * | | Don't use an alert for displaying app-mgmt-errors | kondou | 2013-08-18 | 3 | -10/+44 |
| | | | | | | | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305 | ||||
| | * | | Merge branch 'master' into improve_app-management | kondou | 2013-08-18 | 10 | -36/+47 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into improve_app-management | kondou | 2013-08-09 | 75 | -76/+348 |
| | |\ \ \ | |||||
| | * | | | | Log exception at the catching code | kondou | 2013-08-09 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Improve app-management | kondou | 2013-08-06 | 2 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017 | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 3 | -0/+18 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 5 | -1/+16 |
| | |_|_|/ |/| | | | |||||
| * | | | | [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 |
| |\ \ \ \ | | | | | | | | | | | Fix some JSLint warnings | ||||
| | * \ \ \ | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 81 | -129/+441 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * | | | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | Use JSON to send/receive group data. | ||||
| | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits from PR #4364 for master. | ||||
| * | | | | | | [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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| | * \ \ \ \ \ | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 81 | -122/+464 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| | * | | | | | | check if some encrypted files are left after the app was disabled and warn ↵ | Bjoern Schiessle | 2013-08-12 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user | ||||
| | * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/crypt.php | ||||
| | * | | | | | | user interface to allow user to decrypt all his files once the encryption ↵ | Björn Schießle | 2013-07-29 | 2 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php | ||||
| * | | | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 4 | -4/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add newlines at the end of files | ||||
| | * | | | | | | | 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 |
| |/ / / / / / | |||||
| * | | | | | | 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 | ||||
| | * | | | | | | 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 |
| |/ / / / / / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |