Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes | FlorinPeter | 2013-05-31 | 1 | -35/+49 |
|\ | |||||
| * | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-30 | 2 | -7/+10 |
| |\ | |||||
| * | | fixes for pgsql | Florin Peter | 2013-05-29 | 1 | -4/+4 |
| * | | changed deprecated class | Florin Peter | 2013-05-29 | 1 | -1/+1 |
| * | | fixes if cache returns false | Florin Peter | 2013-05-29 | 1 | -6/+16 |
| * | | fix $parent/$source typo | Florin Peter | 2013-05-29 | 1 | -2/+1 |
| * | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-29 | 9 | -53/+254 |
| |\ \ | |||||
| * | | | fix indention | Björn Schießle | 2013-05-29 | 1 | -5/+5 |
| * | | | remove unnecessary variable | Björn Schießle | 2013-05-29 | 1 | -2/+1 |
| * | | | use public API for error handling; improved while condition | Björn Schießle | 2013-05-29 | 1 | -23/+20 |
| * | | | for external storages we never reach the path 'files', instead we need to lea... | Björn Schießle | 2013-05-29 | 1 | -1/+2 |
| * | | | if one public link share was found, we don't have to check it for the other f... | Björn Schießle | 2013-05-29 | 1 | -10/+12 |
| * | | | check list of users with access to the file from the bottom to the top. This ... | Björn Schießle | 2013-05-29 | 1 | -7/+13 |
* | | | | Merge pull request #3509 from owncloud/update_jquery_to_1_10 | Jörn Friedrich Dreyer | 2013-05-30 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Update jquery to 1.10.0 & add jquery-migrate 1.2.1 | kondou | 2013-05-27 | 1 | -1/+2 |
* | | | | | Merge pull request #3529 from owncloud/folder-permissions | icewind1991 | 2013-05-30 | 2 | -11/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Only retrieve the current user's permissions | Michael Gapczynski | 2013-05-29 | 2 | -5/+6 |
| * | | | | | Cache: provide a function to get the permissions of all files in a folder wit... | Robin Appelman | 2013-05-29 | 2 | -11/+30 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-30 | 1 | -0/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | fix wrong signature delimiter - fix #3523 | Morris Jobke | 2013-05-29 | 1 | -1/+1 |
* | | | | | Merge pull request #3532 from owncloud/scan-update | Michael Gapczynski | 2013-05-29 | 1 | -6/+9 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Organize conditionals in a better order | Michael Gapczynski | 2013-05-29 | 1 | -8/+4 |
| * | | | | Only update metadata that has changed | Michael Gapczynski | 2013-05-29 | 1 | -2/+9 |
* | | | | | Style fixes | Michael Gapczynski | 2013-05-29 | 1 | -21/+21 |
* | | | | | Cache mimetype icons | Robin Appelman | 2013-05-29 | 1 | -7/+15 |
| |/ / / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-29 | 1 | -0/+1 |
|/ / / | |||||
* | | | implement ArrayInterface with Session | Robin Appelman | 2013-05-28 | 2 | -8/+39 |
* | | | merge master into sessionclass | Robin Appelman | 2013-05-28 | 2 | -0/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-28 | 2 | -0/+2 |
* | | | 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 | 4 | -37/+43 |
* | | | Abstract the session away in a class | Robin Appelman | 2013-05-28 | 3 | -0/+150 |
|/ / | |||||
* / | Add PublicEmitter class | Robin Appelman | 2013-05-27 | 1 | -0/+20 |
|/ | |||||
* | 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 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 1 | -0/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-26 | 4 | -0/+4 |
* | | Merge pull request #3388 from roha4000/master | Michael Gapczynski | 2013-05-25 | 1 | -2/+2 |
|\ \ | |||||
| * | | 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 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-25 | 4 | -0/+4 |
* | | | | Merge pull request #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 5 | -11/+160 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-22 | 8 | -20/+47 |
| |\| | | | |||||
| * | | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-22 | 8 | -8/+162 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 2 | -0/+33 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 6 | -10/+82 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix for webdav because initMounts() is triggered twice so we lost the root path | Florin Peter | 2013-05-20 | 1 | -1/+3 |