| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge master into sessionclass | Robin Appelman | 2013-05-28 | 669 | -32892/+2398 |
| |\ | |||||
| | * | Merge pull request #3179 from pawl/patch-1 | Jörn Friedrich Dreyer | 2013-05-28 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Improve IE Compatibility | Paul Brown | 2013-04-29 | 1 | -1/+2 |
| | * | | Merge pull request #2778 from Kondou-ger/optimize_pictures | Jörn Friedrich Dreyer | 2013-05-28 | 118 | -30919/+353 |
| | |\ \ | |||||
| | | * | | Add shellscript for optimization. | kondou | 2013-04-13 | 1 | -0/+20 |
| | | * | | Optimize svgs with scour. | kondou | 2013-04-12 | 61 | -30919/+333 |
| | | * | | Optimize pictures with optipng. | kondou | 2013-04-07 | 56 | -0/+0 |
| | * | | | Merge pull request #3488 from zafi/master | blizzz | 2013-05-28 | 1 | -0/+6 |
| | |\ \ \ | |||||
| | | * | | | The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD | zafi | 2013-05-25 | 1 | -0/+6 |
| | * | | | | Merge pull request #3512 from owncloud/file_encryption_session_fix | FlorinPeter | 2013-05-28 | 3 | -17/+56 |
| | |\ \ \ \ | |||||
| | | * | | | | fix for undefined index | Florin Peter | 2013-05-28 | 1 | -1/+1 |
| | | * | | | | fix for losing private key while being logged in and accessing a public link | Florin Peter | 2013-05-28 | 3 | -16/+55 |
| | |/ / / / | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-28 | 546 | -1958/+1981 |
| * | | | | | fix syntax error | Robin Appelman | 2013-05-28 | 1 | -1/+1 |
| * | | | | | provide a dummy session for CLI | Robin Appelman | 2013-05-28 | 1 | -0/+2 |
| * | | | | | check fix if session start is successfull | Robin Appelman | 2013-05-28 | 1 | -1/+2 |
| * | | | | | Fix session not working error | Robin Appelman | 2013-05-28 | 2 | -2/+4 |
| * | | | | | Use the new session wrapper | Robin Appelman | 2013-05-28 | 8 | -57/+57 |
| * | | | | | Abstract the session away in a class | Robin Appelman | 2013-05-28 | 5 | -0/+221 |
| |/ / / / | |||||
| * | | | | Merge pull request #3510 from owncloud/publicemitter | Frank Karlitschek | 2013-05-27 | 1 | -0/+20 |
| |\ \ \ \ | |||||
| | * | | | | Add PublicEmitter class | Robin Appelman | 2013-05-27 | 1 | -0/+20 |
| |/ / / / | |||||
| * | | | | legacyBlockDecryprt() needs to be public | Björn Schießle | 2013-05-27 | 1 | -1/+1 |
| * | | | | make legacyDecrypt() private als always call legacyBlockDecrypt() from other ... | Björn Schießle | 2013-05-27 | 4 | -6/+6 |
| * | | | | fix migration from old to new encryption | Björn Schießle | 2013-05-27 | 2 | -3/+1 |
| * | | | | Merge pull request #3506 from owncloud/fix_3320 | Björn Schießle | 2013-05-27 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | add event.preventDefault to undelete function | Georg Ehrke | 2013-05-27 | 1 | -0/+1 |
| | * | | | | fix https://github.com/owncloud/core/issues/3320 | Georg Ehrke | 2013-05-27 | 1 | -0/+1 |
| * | | | | | Merge pull request #3495 from owncloud/file_encryption_util_is_error | Thomas Tanghus | 2013-05-27 | 1 | -310/+397 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge branch 'master' into file_encryption_util_is_error | Florin Peter | 2013-05-27 | 689 | -2005/+2383 |
| | |\| | | | | |||||
| | * | | | | | added check by numRows() | Florin Peter | 2013-05-27 | 1 | -335/+387 |
| | * | | | | | fixed error rising from fetchRow | Florin Peter | 2013-05-25 | 1 | -22/+27 |
| | * | | | | | added OC_DB::isError and logging | Florin Peter | 2013-05-25 | 1 | -2/+36 |
| * | | | | | | Merge pull request #3412 from owncloud/fix_2013 | Michael Gapczynski | 2013-05-27 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Don't set Content-Length header if size is unknown | Michael Gapczynski | 2013-05-17 | 1 | -1/+4 |
| * | | | | | | Merge pull request #3481 from owncloud/firsttime_enc | Björn Schießle | 2013-05-27 | 1 | -23/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix first time encryption after app was enabled | Björn Schießle | 2013-05-24 | 1 | -23/+12 |
| * | | | | | | | Merge pull request #3496 from owncloud/file_encryption_tests | FlorinPeter | 2013-05-27 | 9 | -574/+750 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into file_encryption_tests | Florin Peter | 2013-05-27 | 551 | -1103/+1134 |
| | |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 551 | -1103/+1134 |
| | * | | | | | | | added users for tests | Florin Peter | 2013-05-26 | 9 | -891/+1098 |
| | * | | | | | | | improved test | Florin Peter | 2013-05-26 | 7 | -975/+944 |
| |/ / / / / / / | |||||
| * | | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-26 | 664 | -1349/+1535 |
| | |_|/ / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #3478 from davidak/master | Michael Gapczynski | 2013-05-25 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | small typo fix: added 2 whitespaces | davidak | 2013-05-24 | 1 | -2/+2 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #3388 from roha4000/master | Michael Gapczynski | 2013-05-25 | 2 | -2/+29 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | New tests to assure that a move will not affect another users cache entries | Roland Hager | 2013-05-22 | 1 | -0/+27 |
| | * | | | | | | Fixing UPDATE error in filecache table when renaming files by calling move().... | Roland Hager | 2013-05-22 | 1 | -2/+2 |
| * | | | | | | | Merge pull request #3493 from owncloud/bumpversion | Michael Gapczynski | 2013-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Bump version for files_encryption changes | Michael Gapczynski | 2013-05-25 | 1 | -1/+1 |
| * | | | | | | | | increase version and add warning | Frank Karlitschek | 2013-05-25 | 2 | -2/+2 |
| | |_|_|_|/ / / |/| | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |