Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | drop SimpleTest compatibility | Thomas Mueller | 2013-01-24 | 23 | -215/+196 |
| | |||||
* | Merge pull request #1286 from owncloud/ocs_api | Thomas Müller | 2013-01-24 | 1 | -0/+3 |
|\ | | | | | Check that external api methods return instances of OC_OCS_Result | ||||
| * | 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 | 2 | -2/+18 |
|\ \ | | | | | | | add additional mail_smtp.. parameters to fix possible SMTP connection problems. | ||||
| * | | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -2/+2 |
| | | | | | | | | | fixed an other typo. | ||||
| * | | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -1/+1 |
| | | | | | | | | | Fixed type in line 70. Thank you for pointing me to that typo. | ||||
| * | | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added three additional mail_smtp.. parameters. - mail_smtpdebug - enable debug messages to analyse SMTP problems. - mail_smtptimeout - set SMTP timeout which is set to 10s by default and this is sometimes to short especially if a malware/ spam scanner is used. - mail_smtpsecure - force secure SMTP connections. | ||||
| * | | Update lib/mail.php | j-ed | 2013-01-22 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added three additional mail_smtp.. parameters. - mail_smtpdebug - enable debug messages to analyse SMTP problems. - mail_smtptimeout - set SMTP timeout which is set to 10s by default and this is sometimes to short especially if a malware/ spam scanner is used. - mail_smtpsecure - force secure SMTP connections. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-24 | 34 | -170/+244 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-23 | 166 | -1081/+4115 |
| | | | |||||
* | | | Merge pull request #1113 from owncloud/fix-issue-1085 | Michael Gapczynski | 2013-01-22 | 6 | -18/+24 |
|\ \ \ | | | | | | | | | Fix rendering of database connection error page | ||||
| * | | | 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 |
| | | | | |||||
| * | | | Merge branch 'master' into fix-issue-1085 | Michael Gapczynski | 2013-01-07 | 148 | -2782/+3647 |
| |\ \ \ | |||||
| * | | | | Move template parameters around so database error page is properly rendered | Michael Gapczynski | 2013-01-07 | 6 | -18/+15 |
| | | | | | |||||
* | | | | | Merge pull request #1259 from TheSFReader/master | Thomas Müller | 2013-01-22 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add two specific mimetype extensions (ebooks): for epub and mobi files | ||||
| * | | | | | Add ebook specific mimetypes | TheSFReader | 2013-01-17 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Add ebook specific mimetypes | TheSFReader | 2013-01-17 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #1237 from owncloud/fix-template-tests | icewind1991 | 2013-01-22 | 1 | -4/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove unnecessary ob_end_clean() from template tests | ||||
| * | | | | | | Remove unnecessary ob_end_clean() from template tests | Michael Gapczynski | 2013-01-19 | 1 | -4/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1105 from owncloud/files_encryption | Sam Tuke | 2013-01-22 | 38 | -793/+4118 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Files encryption | ||||
| * | | | | | | Merge branch 'master' into files_encryption | Sam Tuke | 2013-01-22 | 740 | -9271/+9056 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/templates/settings.php | ||||
* | | | | | | | Merge pull request #1255 from owncloud/leftcontent_fix | icewind1991 | 2013-01-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix scrolling of leftcontent | ||||
| * | | | | | | | Fix scrolling of leftcontent | Robin Appelman | 2013-01-21 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | enable unittesting on appframework and apptemplateadvanced | Thomas Mueller | 2013-01-21 | 1 | -1/+2 |
|/ / / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-21 | 48 | -121/+173 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1247 from ↵ | Thomas Müller | 2013-01-20 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | owncloud/clear-queries-cache-on-schema-change-master cached queries need to be reset on schema change because they become inv... | ||||
| * | | | | | | cached queries need to be reset on schema change because they become invalid | Thomas Mueller | 2013-01-20 | 1 | -0/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | fixes: https://github.com/owncloud/apps/issues/468 | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-20 | 150 | -2825/+3011 |
| | | | | | | |||||
* | | | | | | Merge pull request #1233 from owncloud/visualphpunit | Lukas Reschke | 2013-01-19 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add listener for VisualPHPUnit | ||||
| * | | | | | | Add listener for VisualPHPUnit | Michael Gapczynski | 2013-01-18 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Sanitize the exception | Lukas Reschke | 2013-01-19 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Also replace the backslash with a minus | Lukas Reschke | 2013-01-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Windows systems | ||||
* | | | | | | | Merge pull request #1214 from Raydiation/master | Bernhard Posselt | 2013-01-19 | 1 | -0/+17 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Load Classpaths of apps before appinfo/routes.php | ||||
| * | | | | | | | spaces to tabs | Bernhard Posselt | 2013-01-17 | 1 | -12/+12 |
| | | | | | | | | |||||
| * | | | | | | | load classpaths of apps before routes | Bernhard Posselt | 2013-01-17 | 1 | -0/+17 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1230 from owncloud/remove-unused-autocomplete.php | Lukas Reschke | 2013-01-19 | 1 | -54/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove uneeded file | ||||
| * | | | | | | | | Remove uneeded file | Lukas Reschke | 2013-01-18 | 1 | -54/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't saw any usage of this file through the code, I assume it can safely be removed. | ||||
* | | | | | | | | | Merge pull request #1228 from owncloud/generating_zip_message | Jan-Christoph Borchardt | 2013-01-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Make the ZIP download information friendlier | ||||
| * | | | | | | | | Change the second part of the notification | Lukas Reschke | 2013-01-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Make the message friendlier | Lukas Reschke | 2013-01-18 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-19 | 20 | -118/+140 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #986 from owncloud/fixing-784-master | Thomas Müller | 2013-01-18 | 8 | -16/+171 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | the maximum upload size is now part of the response of the upload and de... | ||||
| * | | | | | | | fixing indent | Thomas Mueller | 2013-01-18 | 5 | -73/+73 |
| | | | | | | | | |||||
| * | | | | | | | adding a ajax call to get the current file storage stats like free space | Thomas Mueller | 2013-01-11 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logic to call it every 5 minutes make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use | ||||
| * | | | | | | | load jquery-visibility | Thomas Mueller | 2013-01-11 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | adding jquery-visibility | Thomas Mueller | 2013-01-11 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mathiasbynens/jquery-visibility MIT and GPL licensed | ||||
| * | | | | | | | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-11 | 275 | -5555/+8279 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-06 | 502 | -7419/+14471 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php |