Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3561 from owncloud/user | icewind1991 | 2013-06-03 | 1 | -1/+1 |
|\ | |||||
| * | fix broken tests | Florin Peter | 2013-05-31 | 1 | -1/+1 |
* | | Merge pull request #3051 from owncloud/backgroundjob | icewind1991 | 2013-06-02 | 3 | -12/+11 |
|\ \ | |||||
| * | | Files: use public api to register backgroundjob | Robin Appelman | 2013-06-02 | 1 | -1/+1 |
| * | | merge master into backgroundjob | Robin Appelman | 2013-06-02 | 376 | -3989/+10324 |
| |\ \ | |||||
| * | | | Rework background job system | Robin Appelman | 2013-04-20 | 2 | -11/+10 |
* | | | | Merge pull request #3567 from owncloud/fixing-3466 | Frank Karlitschek | 2013-06-02 | 1 | -2/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | In cases where smb4php returns false of an empty array stat/( has to return f... | Thomas Mueller | 2013-06-01 | 1 | -2/+12 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-02 | 2 | -1/+25 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-01 | 6 | -1/+28 |
* | | | | Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js | blizzz | 2013-05-31 | 2 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | LDAP: sqlite compatibility for emptyiing tables | Arthur Schiwon | 2013-05-31 | 1 | -1/+7 |
| * | | | | LDAP: fix setting value of checkbox after loading configuration | Arthur Schiwon | 2013-05-31 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling | blizzz | 2013-05-31 | 1 | -3/+9 |
|\ \ \ \ | |||||
| * | | | | LDAP: fix possible recursion | Arthur Schiwon | 2013-05-25 | 1 | -0/+7 |
| * | | | | LDAP: fix handling when LDAP Host is offline | Arthur Schiwon | 2013-05-25 | 1 | -3/+2 |
| | |/ / | |/| | | |||||
* | | | | also fix login errors while filesystem is not loaded in app.php | Florin Peter | 2013-05-31 | 1 | -0/+6 |
* | | | | Merge branch 'master' into files_encryption_fs_loaded_fix | Florin Peter | 2013-05-31 | 7 | -142/+145 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes | FlorinPeter | 2013-05-31 | 7 | -142/+145 |
| |\ \ \ | |||||
| | * | | | added our own file extension .part will not work here if we use file_get_cont... | Florin Peter | 2013-05-30 | 2 | -5/+5 |
| | * | | | prevent files_versions from calling file proxy which calls files_encryption a... | Florin Peter | 2013-05-30 | 1 | -0/+17 |
| | * | | | fix share and un-share for single file | Florin Peter | 2013-05-30 | 1 | -23/+13 |
| | * | | | fixed problems with file_get_contents and file_put_contents this problem was ... | Florin Peter | 2013-05-30 | 3 | -127/+92 |
| | * | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-30 | 16 | -718/+757 |
| | |\ \ \ | |||||
| | * | | | | fixed typo | Florin Peter | 2013-05-29 | 1 | -1/+1 |
| | * | | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-29 | 11 | -34/+40 |
| | |\ \ \ \ | |||||
| | * | | | | | fix for share folder on external storage | Florin Peter | 2013-05-29 | 2 | -2/+33 |
| | * | | | | | check list of users with access to the file from the bottom to the top. This ... | Björn Schießle | 2013-05-29 | 1 | -2/+2 |
| | * | | | | | fixed if fopen returns false typically on external storage | Florin Peter | 2013-05-28 | 1 | -1/+1 |
* | | | | | | | fix login errors while filesystem is not loaded | Florin Peter | 2013-05-31 | 1 | -0/+5 |
|/ / / / / / | |||||
* | | | | | | [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 |