| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into files_encryption to get the latest files_trashbin app | Florin Peter | 2013-04-30 | 1086 | -15362/+14084 |
| |\ | |||||
| | * | Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_m... | FlorinPeter | 2013-04-30 | 1 | -86/+309 |
| | |\ | |||||
| | | * | delete and restore of versions and share-keys now works | Florin Peter | 2013-04-28 | 1 | -20/+37 |
| | | * | added handling for share-keys | Florin Peter | 2013-04-28 | 1 | -13/+88 |
| | | * | restore fixed | Florin Peter | 2013-04-28 | 1 | -22/+40 |
| | | * | fixed some problems and broken code | Florin Peter | 2013-04-28 | 1 | -42/+83 |
| | | * | restore encryption keys from trash bin (development snapshot) | Björn Schießle | 2013-04-28 | 1 | -45/+72 |
| | | * | move encryption keys to trash bin | Björn Schießle | 2013-04-28 | 1 | -31/+76 |
| | * | | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache | FlorinPeter | 2013-04-29 | 2 | -2/+2 |
| | |\ \ | |||||
| | | * | | fix for infinite loop causing on files_encryption branch when testing "apps/f... | Florin Peter | 2013-04-29 | 2 | -2/+2 |
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-30 | 118 | -631/+852 |
| | |/ / | |||||
| | * | | Merge pull request #3159 from owncloud/reword | Jan-Christoph Borchardt | 2013-04-29 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Reword sentence and move HTML out of translation | Lukas Reschke | 2013-04-29 | 1 | -1/+1 |
| | | |/ | |||||
| | * | | Merge pull request #3160 from owncloud/remove-onclick | Morris Jobke | 2013-04-29 | 2 | -2/+6 |
| | |\ \ | |||||
| | | * | | It's a class | Lukas Reschke | 2013-04-28 | 1 | -1/+1 |
| | | * | | Remove uneeded onclick handler | Lukas Reschke | 2013-04-28 | 1 | -1/+1 |
| | | * | | Move onclick handler | Lukas Reschke | 2013-04-28 | 2 | -1/+5 |
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-29 | 51 | -135/+199 |
| | | |/ | |/| | |||||
| | * | | Merge pull request #3154 from owncloud/fix_3153 | Frank Karlitschek | 2013-04-28 | 2 | -10/+66 |
| | |\ \ | |||||
| | | * | | Fix typo | Tom Needham | 2013-04-27 | 1 | -1/+1 |
| | | * | | Code style for ocs/routes.php | Tom Needham | 2013-04-27 | 1 | -9/+65 |
| | | * | | Change app identifier for core api routes | Tom Needham | 2013-04-27 | 1 | -8/+8 |
| | | * | | Use correct variable when checking auth | Tom Needham | 2013-04-27 | 1 | -1/+1 |
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-28 | 233 | -1591/+876 |
| | | |/ | |/| | |||||
| | * | | Merge pull request #3121 from owncloud/ocs_fix_api_response | Lukas Reschke | 2013-04-27 | 1 | -2/+2 |
| | |\ \ | | |/ | |/| | |||||
| | | * | Correct the api response when both a shipped app and/or a third party app fail | Tom Needham | 2013-04-25 | 1 | -2/+2 |
| | * | | Merge pull request #3146 from owncloud/restart-hint | Morris Jobke | 2013-04-27 | 1 | -13/+13 |
| | |\ \ | |||||
| | | * | | web_server_restart needs to be true to display the hint | Bart Visscher | 2013-04-26 | 1 | -13/+13 |
| | * | | | Merge pull request #3145 from owncloud/magic_quotes_gpc-check | Morris Jobke | 2013-04-27 | 1 | -0/+5 |
| | |\ \ \ | |||||
| | | * | | | Add check for Magic Quotes | Bart Visscher | 2013-04-26 | 1 | -0/+5 |
| | | |/ / | |||||
| | * | | | Merge pull request #3114 from owncloud/update-notification | Raghu Nayyar | 2013-04-26 | 5 | -38/+32 |
| | |\ \ \ | |||||
| | | * | | | Remove uneeded link | Lukas Reschke | 2013-04-24 | 1 | -1/+1 |
| | | * | | | Clubbing Exact styles together. | raghunayyar | 2013-04-24 | 1 | -5/+2 |
| | | * | | | Add an update notification on every page for admin users | Lukas Reschke | 2013-04-24 | 5 | -36/+33 |
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-27 | 934 | -28068/+28442 |
| | * | | | | Code style | Robin Appelman | 2013-04-26 | 1 | -206/+231 |
| | * | | | | Merge pull request #3136 from owncloud/mount-cleanup | icewind1991 | 2013-04-26 | 15 | -201/+326 |
| | |\ \ \ \ | |||||
| | | * | | | | Further seperation of mount management logic | Robin Appelman | 2013-04-26 | 11 | -171/+235 |
| | | * | | | | Cache: seperate handing of numeric storage id's to it's own class | Robin Appelman | 2013-04-26 | 4 | -30/+91 |
| | * | | | | | Merge pull request #3002 from owncloud/priorize_common_languages | Bart Visscher | 2013-04-26 | 3 | -4/+21 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | | * | | | | Make divider not selectable | kondou | 2013-04-19 | 2 | -5/+4 |
| | | * | | | | Priorize common languages. | kondou | 2013-04-18 | 3 | -4/+22 |
| | * | | | | | Merge pull request #3026 from owncloud/cli-no-session | Bart Visscher | 2013-04-26 | 1 | -1/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Don't start the session when in cli mode | Robin Appelman | 2013-04-26 | 1 | -1/+3 |
| | * | | | | | | Merge pull request #3028 from owncloud/simplyfy-resource-locating | Bart Visscher | 2013-04-26 | 1 | -42/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Simplify app js locating for layout pages | Bart Visscher | 2013-04-26 | 1 | -11/+8 |
| | | * | | | | | | Simplify app css locating for layout pages | Bart Visscher | 2013-04-26 | 1 | -31/+9 |
| | | |/ / / / / | |||||
| | * | | | | | | Merge pull request #2955 from owncloud/displaynames-numeric | Bart Visscher | 2013-04-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix OC_User::getDisplaynames when using numeric user id's | Robin Appelman | 2013-04-17 | 1 | -1/+1 |
| | * | | | | | | | Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen | Bart Visscher | 2013-04-26 | 2 | -12/+21 |
| | |\ \ \ \ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |