Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1318 from j-ed/master | Thomas Müller | 2013-01-28 | 1 | -0/+2 |
|\ | |||||
| * | Update lib/mail.php | j-ed | 2013-01-26 | 1 | -0/+2 |
* | | Merge pull request #1321 from owncloud/csp-fixes | Thomas Müller | 2013-01-28 | 1 | -5/+0 |
|\ \ | |||||
| * | | Fix undefined variable | Lukas Reschke | 2013-01-26 | 1 | -5/+0 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-27 | 2 | -1/+6 |
* | | | Merge pull request #1320 from owncloud/implements-1316-master | Lukas Reschke | 2013-01-26 | 1 | -1/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | lookup for OCA classes in all apps folders | Thomas Mueller | 2013-01-26 | 1 | -1/+8 |
* | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -0/+19 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-19 | 2 | -0/+2 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 54 | -934/+961 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-11 | 6 | -277/+611 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 16 | -553/+766 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 7 | -159/+194 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo() | Thomas Mueller | 2013-01-02 | 1 | -0/+19 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-26 | 2 | -2/+3 |
* | | | | | | | | Remove the CSP header for Firefox | Lukas Reschke | 2013-01-25 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'master' into no-inline-js | Lukas Reschke | 2013-01-25 | 5 | -8/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-25 | 1 | -0/+1 |
| * | | | | | | | | Merge pull request #1286 from owncloud/ocs_api | Thomas Müller | 2013-01-24 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Code style update | Tom Needham | 2013-01-23 | 1 | -1/+1 |
| | * | | | | | | | | Check that api methods return the correct result type | Tom Needham | 2013-01-16 | 1 | -0/+3 |
| * | | | | | | | | | Merge pull request #1265 from j-ed/master | Lukas Reschke | 2013-01-24 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Update lib/mail.php | j-ed | 2013-01-22 | 1 | -2/+8 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-24 | 2 | -6/+8 |
* | | | | | | | | | | Initialize router also if ownCloud isn't installed | Lukas Reschke | 2013-01-25 | 1 | -16/+18 |
* | | | | | | | | | | Allow the loading of external images | Lukas Reschke | 2013-01-25 | 1 | -1/+1 |
* | | | | | | | | | | Notice about changing the standard policy | Lukas Reschke | 2013-01-23 | 1 | -0/+1 |
* | | | | | | | | | | Allow admins to change the CSP policy in the config file | Lukas Reschke | 2013-01-23 | 1 | -1/+1 |
* | | | | | | | | | | update to jquery-ui 1.10.0 | Thomas Mueller | 2013-01-23 | 1 | -2/+2 |
* | | | | | | | | | | Merge master... | Lukas Reschke | 2013-01-23 | 11 | -19/+42 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-23 | 4 | -0/+4 |
| * | | | | | | | | | Merge pull request #1113 from owncloud/fix-issue-1085 | Michael Gapczynski | 2013-01-22 | 3 | -15/+23 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Make database connection error messages less verbose | Michael Gapczynski | 2013-01-21 | 1 | -2/+3 |
| | * | | | | | | | | | returning http status code 503 in case connecting to the database failed | Thomas Mueller | 2013-01-21 | 1 | -0/+8 |
| | * | | | | | | | | | Move template parameters around so database error page is properly rendered | Michael Gapczynski | 2013-01-07 | 3 | -15/+14 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1259 from TheSFReader/master | Thomas Müller | 2013-01-22 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add ebook specific mimetypes | TheSFReader | 2013-01-17 | 1 | -1/+0 |
| | * | | | | | | | | | Add ebook specific mimetypes | TheSFReader | 2013-01-17 | 1 | -0/+3 |
| * | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 60 | -935/+984 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 3 | -103/+508 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Removed unnecessary line | Sam Tuke | 2013-01-10 | 1 | -1/+0 |
| * | | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-10 | 4 | -175/+110 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-06 | 3 | -48/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-05 | 18 | -593/+833 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-02 | 33 | -960/+1430 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption | Sam Tuke | 2012-12-12 | 130 | -1855/+4063 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Reverted temporary changes to core lib files | Sam Tuke | 2012-12-11 | 2 | -5/+5 |
| * | | | | | | | | | | | | | | | Added library phpseclib | Sam Tuke | 2012-12-11 | 4 | -13/+14 |
| * | | | | | | | | | | | | | | | all unit files_encryption crypt unit tests now passing after merge | Sam Tuke | 2012-10-17 | 2 | -16/+22 |
| * | | | | | | | | | | | | | | | Merged branch 'master' | Sam Tuke | 2012-10-16 | 146 | -3636/+8930 |