Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into convert-oc_config | Thomas Mueller | 2013-07-03 | 696 | -4011/+4294 |
|\ | |||||
| * | Merge pull request #3911 from owncloud/fixing-unittests-master | Michael Gapczynski | 2013-07-03 | 1 | -2/+4 |
| |\ | |||||
| | * | rename can cause mtime change - invalid assert | Thomas Müller | 2013-07-01 | 1 | -2/+4 |
| * | | Merge pull request #3915 from owncloud/summary_as_last_filelist_entry | Morris Jobke | 2013-07-03 | 2 | -2/+47 |
| |\ \ | |||||
| | * | | Don't escape filesize (can contain a '<') | kondou | 2013-07-02 | 1 | -1/+1 |
| | * | | Show a summary as the last filelist entry | kondou | 2013-07-02 | 2 | -2/+47 |
| * | | | don't run hooks for .part files | Björn Schießle | 2013-07-03 | 1 | -1/+1 |
| * | | | if a part file gets renamed to a real file, that this was the second step of ... | Björn Schießle | 2013-07-03 | 1 | -2/+20 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-03 | 533 | -2487/+2494 |
| * | | | Merge pull request #3858 from owncloud/more_ssl_error_messages | Björn Schießle | 2013-07-02 | 1 | -6/+5 |
| |\ \ \ | |||||
| | * | | | add openssl_error_string() output to the owncloud.log | Björn Schießle | 2013-06-26 | 1 | -6/+5 |
| * | | | | Merge pull request #3870 from owncloud/reset_migration_status | Björn Schießle | 2013-07-02 | 4 | -0/+26 |
| |\ \ \ \ | |||||
| | * | | | | fix function documentation | Björn Schießle | 2013-06-27 | 1 | -1/+1 |
| | * | | | | introduce pre-disable-app hook and use it for the encryption app to reset mig... | Björn Schießle | 2013-06-27 | 4 | -0/+26 |
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-02 | 251 | -1688/+1868 |
| * | | | | | improved error message | Björn Schießle | 2013-07-02 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #3748 from owncloud/fixing-3740-master | Thomas Müller | 2013-07-01 | 1 | -8/+14 |
| |\ \ \ \ | |||||
| | * | | | | use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set | Thomas Müller | 2013-07-01 | 1 | -2/+8 |
| | * | | | | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better tha... | Thomas Mueller | 2013-06-17 | 1 | -7/+7 |
* | | | | | | on unit test use @expectedException | Thomas Müller | 2013-07-02 | 2 | -6/+12 |
* | | | | | | Merge branch 'master' into convert-oc_config | Thomas Müller | 2013-07-01 | 820 | -15995/+19116 |
|\| | | | | | |||||
| * | | | | | Merge pull request #3775 from owncloud/test_fixes_for_dbschema | Thomas Müller | 2013-07-01 | 3 | -61/+63 |
| |\ \ \ \ \ | |||||
| | * | | | | | Going from text to clob is not something we do. | Bart Visscher | 2013-06-28 | 2 | -7/+2 |
| | * | | | | | isError should detect a PEAR_Error even if the backend is PDO. | Thomas Mueller | 2013-06-28 | 1 | -19/+23 |
| | * | | | | | remove wrong check here | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -1/+0 |
| | * | | | | | correctly handle error results of PDO and MDB2 backends | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -3/+6 |
| | * | | | | | use executeAudited, add table name to assert message, skip schema changing te... | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -43/+44 |
| * | | | | | | Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block | Thomas Müller | 2013-07-01 | 1 | -85/+64 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | remove unnecessary exception handling | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -85/+64 |
| * | | | | | | | Merge pull request #3903 from owncloud/nonpublic-uploading | Thomas Müller | 2013-07-01 | 2 | -36/+36 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | fix detection of public upload in filelist.js | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| | * | | | | | | fix uploading when ['dirtoken'] is not set | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| | * | | | | | | code style | Robin Appelman | 2013-07-01 | 1 | -34/+34 |
| * | | | | | | | Merge pull request #3894 from owncloud/ie8_compatibility_fixes | Thomas Müller | 2013-07-01 | 2 | -2/+11 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use svg to png fallback on demand only | Victor Dubiniuk | 2013-06-28 | 1 | -1/+1 |
| | * | | | | | | | Add fallback for svg app icons | Victor Dubiniuk | 2013-06-28 | 1 | -1/+5 |
| | * | | | | | | | Hide a ghost image on the apps management page | Victor Dubiniuk | 2013-06-28 | 2 | -1/+6 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | backport from pull request #3863 | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' of github.com:owncloud/core | Björn Schießle | 2013-07-01 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge pull request #3857 from owncloud/enable_single_autotest | Morris Jobke | 2013-07-01 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | enable testing individual tests | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -3/+3 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| * | | | | | | | | set default logo claim to '' | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| * | | | | | | | | add logo claim to defaults.php | Björn Schießle | 2013-07-01 | 4 | -9/+12 |
| * | | | | | | | | logo claim added | Björn Schießle | 2013-07-01 | 1 | -0/+3 |
| * | | | | | | | | make mail footer aware of different themes | Björn Schießle | 2013-07-01 | 1 | -3/+4 |
| * | | | | | | | | remove unneeded if condition | Björn Schießle | 2013-07-01 | 1 | -5/+1 |
| * | | | | | | | | lib/defaults.php should only contain the default strings and read the other s... | Björn Schießle | 2013-07-01 | 1 | -38/+44 |
| * | | | | | | | | check for updates only in the community edition | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| * | | | | | | | | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 5 | -20/+44 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3223 from owncloud/fix-2820 | Morris Jobke | 2013-07-01 | 4 | -9/+40 |
| |\ \ \ \ \ \ \ |