Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix typo | Robin Appelman | 2013-05-09 | 2 | -2/+2 |
* | New hook system | Robin Appelman | 2013-05-07 | 3 | -0/+137 |
* | Merge pull request #3120 from owncloud/ocs_properties | Bart Visscher | 2013-05-05 | 1 | -1/+1 |
|\ | |||||
| * | Make class properties protected instead of private to allow subclassing | Tom Needham | 2013-04-23 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-04 | 1 | -0/+8 |
* | | Merge pull request #3222 from owncloud/fix-3218 | Bart Visscher | 2013-05-03 | 2 | -2/+5 |
|\ \ | |||||
| * | | One more mount point fix | Michael Gapczynski | 2013-05-02 | 1 | -1/+4 |
| * | | Fix retrieving of mount points for shared storage, fix #3218 | Michael Gapczynski | 2013-05-02 | 1 | -1/+1 |
* | | | Merge pull request #2972 from AndreasErgenzinger/master | Bart Visscher | 2013-05-03 | 1 | -1/+13 |
|\ \ \ | |||||
| * | | | additional safety checks | AndreasErgenzinger | 2013-04-17 | 1 | -1/+3 |
| * | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -9/+10 |
| * | | | merge translations with those from theme | AndreasErgenzinger | 2013-04-17 | 1 | -0/+9 |
* | | | | Merge pull request #2491 from riso/xsendfile_fix_zip | Bart Visscher | 2013-05-03 | 2 | -20/+22 |
|\ \ \ \ | |||||
| * | | | | fixed xsendfile zip generation race condition | Valerio Ponte | 2013-03-20 | 2 | -20/+22 |
* | | | | | Merge pull request #3216 from owncloud/fix-api-3rdparty | Tom Needham | 2013-05-02 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | respect format output | Bernhard Posselt | 2013-05-02 | 1 | -2/+3 |
| * | | | | | logout before output to not run into header already sent problems | Bernhard Posselt | 2013-05-02 | 1 | -1/+2 |
| * | | | | | fix bug that would only return error responses for 3rdparty apps | Bernhard Posselt | 2013-05-02 | 1 | -1/+5 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3183 from miicha/patch-1 | Thomas Müller | 2013-05-02 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | fixing mimetype for "new" ms office formats | miicha | 2013-04-30 | 1 | -3/+3 |
* | | | | | typo fix in a comment. | joel hansson | 2013-05-01 | 1 | -1/+1 |
* | | | | | Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache | FlorinPeter | 2013-04-29 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | fix for infinite loop causing on files_encryption branch when testing "apps/f... | Florin Peter | 2013-04-29 | 2 | -2/+2 |
| |/ / / / | |||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-30 | 1 | -1/+11 |
|/ / / / | |||||
* | | | | Merge pull request #3154 from owncloud/fix_3153 | Frank Karlitschek | 2013-04-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use correct variable when checking auth | Tom Needham | 2013-04-27 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-28 | 52 | -161/+6 |
* | | | | | Merge pull request #3121 from owncloud/ocs_fix_api_response | Lukas Reschke | 2013-04-27 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Correct the api response when both a shipped app and/or a third party app fail | Tom Needham | 2013-04-25 | 1 | -2/+2 |
* | | | | | Merge pull request #3146 from owncloud/restart-hint | Morris Jobke | 2013-04-27 | 1 | -13/+13 |
|\ \ \ \ \ | |||||
| * | | | | | web_server_restart needs to be true to display the hint | Bart Visscher | 2013-04-26 | 1 | -13/+13 |
* | | | | | | Merge pull request #3145 from owncloud/magic_quotes_gpc-check | Morris Jobke | 2013-04-27 | 1 | -0/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add check for Magic Quotes | Bart Visscher | 2013-04-26 | 1 | -0/+5 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3114 from owncloud/update-notification | Raghu Nayyar | 2013-04-26 | 2 | -34/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add an update notification on every page for admin users | Lukas Reschke | 2013-04-24 | 2 | -34/+26 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-27 | 44 | -130/+105 |
* | | | | | | | Code style | Robin Appelman | 2013-04-26 | 1 | -206/+231 |
* | | | | | | | Merge pull request #3136 from owncloud/mount-cleanup | icewind1991 | 2013-04-26 | 10 | -139/+255 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Further seperation of mount management logic | Robin Appelman | 2013-04-26 | 6 | -109/+164 |
| * | | | | | | Cache: seperate handing of numeric storage id's to it's own class | Robin Appelman | 2013-04-26 | 4 | -30/+91 |
* | | | | | | | Merge pull request #3026 from owncloud/cli-no-session | Bart Visscher | 2013-04-26 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Don't start the session when in cli mode | Robin Appelman | 2013-04-26 | 1 | -1/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #3028 from owncloud/simplyfy-resource-locating | Bart Visscher | 2013-04-26 | 1 | -42/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Simplify app js locating for layout pages | Bart Visscher | 2013-04-26 | 1 | -11/+8 |
| * | | | | | | | Simplify app css locating for layout pages | Bart Visscher | 2013-04-26 | 1 | -31/+9 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #2955 from owncloud/displaynames-numeric | Bart Visscher | 2013-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix OC_User::getDisplaynames when using numeric user id's | Robin Appelman | 2013-04-17 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy | Bart Visscher | 2013-04-26 | 1 | -6/+7 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | request.php: add type check to the not empty check of a string | herbrechtsmeier | 2013-03-09 | 1 | -5/+5 |
| * | | | | | | | Overwrite host and webroot when forcessl is enabled | herbrechtsmeier | 2013-03-09 | 1 | -3/+4 |