Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-31 | 6 | -0/+19 |
* | LDAP: fix generation of alternate internal name on conflicts. Use also smalle... | Arthur Schiwon | 2013-05-30 | 1 | -2/+2 |
* | Merge pull request #3529 from owncloud/folder-permissions | icewind1991 | 2013-05-30 | 2 | -1/+31 |
|\ | |||||
| * | Implement getDirectoryPermissions() in Shared Permissions, fixes #2846 | Michael Gapczynski | 2013-05-29 | 2 | -1/+31 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-30 | 13 | -18/+44 |
* | | reformat code | Florin Peter | 2013-05-29 | 2 | -16/+16 |
* | | changed " to ' | Florin Peter | 2013-05-29 | 3 | -13/+13 |
* | | changed l10n to full sentences | Florin Peter | 2013-05-29 | 1 | -14/+25 |
* | | changes l10n after review | Florin Peter | 2013-05-29 | 1 | -5/+5 |
* | | changes after review | Florin Peter | 2013-05-29 | 1 | -1/+5 |
* | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 11 | -39/+45 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-29 | 3 | -2/+12 |
| * | fixed missing convert to new session handler | Florin Peter | 2013-05-28 | 1 | -3/+2 |
| * | fixed encryption session namespace to avoid problems | Florin Peter | 2013-05-28 | 5 | -11/+11 |
| * | merge master into sessionclass | Robin Appelman | 2013-05-28 | 5 | -15/+70 |
| |\ | |||||
| * | | fix syntax error | Robin Appelman | 2013-05-28 | 1 | -1/+1 |
| * | | Use the new session wrapper | Robin Appelman | 2013-05-28 | 4 | -20/+14 |
* | | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-28 | 5 | -21/+71 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 2 | -1/+14 |
| |/ | |||||
* | | $_POST["adminEnableRecovery"] is a string | Björn Schießle | 2013-05-28 | 1 | -1/+1 |
* | | changed to public log api | Florin Peter | 2013-05-27 | 4 | -16/+16 |
* | | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 9 | -58/+52 |
* | | changed basic auth to test user | Florin Peter | 2013-05-27 | 1 | -3/+3 |
* | | Merge branch 'master' into remove_unused_vars | Björn Schießle | 2013-05-27 | 4 | -15/+13 |
|\| | |||||
| * | 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 |
* | | replace == with === | Björn Schießle | 2013-05-27 | 2 | -3/+3 |
* | | reformat code | Florin Peter | 2013-05-27 | 11 | -660/+694 |
* | | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-27 | 2 | -309/+398 |
|\| | |||||
| * | 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 branch 'master' into file_encryption_util_is_error | Florin Peter | 2013-05-27 | 70 | -611/+949 |
| |\| | |||||
| * | | 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 |
* | | | fix tests, after unused variables are removed | Björn Schießle | 2013-05-27 | 1 | -1/+1 |
* | | | remove unused varaibles | Björn Schießle | 2013-05-27 | 2 | -4/+2 |
| |/ |/| | |||||
* | | 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 branch 'master' into file_encryption_tests | Florin Peter | 2013-05-27 | 3 | -2/+25 |
|\ \ \ | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 3 | -2/+25 |
* | | | | 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 | 60 | -9/+163 |
| |/ |/| | |||||
* | | 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 |
| |/ |