Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-29 | 552 | -1868/+1887 |
* | Merge pull request #3511 from owncloud/sessionclass | icewind1991 | 2013-05-28 | 20 | -238/+336 |
|\ | |||||
| * | didn't mean to commit this yet | Robin Appelman | 2013-05-28 | 5 | -670/+0 |
| * | fixed missing convert to new session handler | Florin Peter | 2013-05-28 | 1 | -3/+2 |
| * | Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionc... | Florin Peter | 2013-05-28 | 5 | -8/+548 |
| |\ | |||||
| | * | implement ArrayInterface with Session | Robin Appelman | 2013-05-28 | 5 | -8/+548 |
| * | | fixed encryption session namespace to avoid problems | Florin Peter | 2013-05-28 | 5 | -11/+11 |
| |/ | |||||
| * | 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 |
|\ \ \ \ \ \ |