Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-08 | 1 | -0/+18 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-06 | 62 | -3/+69 |
| | |||||
* | Merge pull request #3951 from owncloud/fixing-3936-master | Thomas Müller | 2013-07-05 | 1 | -1/+12 |
|\ | | | | | get the real physical folder name for anonymous upload | ||||
| * | proper fix for getting the shared item if no user is logged in | Thomas Müller | 2013-07-05 | 1 | -1/+12 |
| | | |||||
* | | Merge pull request #3957 from owncloud/config-glob-fail | Thomas Müller | 2013-07-05 | 1 | -0/+3 |
|\ \ | |/ |/| | OC_Config: handle failure of glob('*.config.php') | ||||
| * | OC_Config: handle failure of glob('*.config.php') | Robin Appelman | 2013-07-05 | 1 | -0/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-05 | 1 | -1/+5 |
|/ | |||||
* | eddition string should be empty by default | Björn Schießle | 2013-07-04 | 1 | -1/+1 |
| | |||||
* | add public api | Björn Schießle | 2013-07-04 | 1 | -0/+108 |
| | |||||
* | move to non-static OC_Defaults | Björn Schießle | 2013-07-04 | 3 | -58/+61 |
| | | | | | | Conflicts: lib/mail.php | ||||
* | Add init funtion to OC_Defaults to be able to wrap translatable strings | Björn Schießle | 2013-07-04 | 2 | -9/+26 |
| | |||||
* | Merge pull request #3888 from owncloud/ocs_api_fixes | Bart Visscher | 2013-07-03 | 1 | -0/+2 |
|\ | | | | | Ocs api fixes | ||||
| * | Allow setting defaults and requirements for the api route | Bart Visscher | 2013-06-28 | 1 | -0/+2 |
| | | |||||
* | | Suppress warning in setup if config doesn't exist | kondou | 2013-07-03 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | | | | | | | a write operation, hence emit a write signal | ||||
* | | Merge pull request #3870 from owncloud/reset_migration_status | Björn Schießle | 2013-07-02 | 1 | -0/+1 |
|\ \ | | | | | | | introduce pre-disable-app hook and first usage in files_encryption | ||||
| * | | introduce pre-disable-app hook and use it for the encryption app to reset ↵ | Björn Schießle | 2013-06-27 | 1 | -0/+1 |
| |/ | | | | | | | migration status if the app was disabled | ||||
* | | Merge pull request #3748 from owncloud/fixing-3740-master | Thomas Müller | 2013-07-01 | 1 | -8/+14 |
|\ \ | | | | | | | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette... | ||||
| * | | 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 ↵ | Thomas Mueller | 2013-06-17 | 1 | -7/+7 |
| | | | | | | | | | | | | than nothing | ||||
* | | | Merge pull request #3775 from owncloud/test_fixes_for_dbschema | Thomas Müller | 2013-07-01 | 1 | -17/+24 |
|\ \ \ | | | | | | | | | use executeAudited, add table name to assert message, skip schema changi... | ||||
| * | | | isError should detect a PEAR_Error even if the backend is PDO. | Thomas Mueller | 2013-06-28 | 1 | -19/+23 |
| | | | | | | | | | | | | | | | | This can happen on errors during schema migration - which is always done with MDB2 | ||||
| * | | | correctly handle error results of PDO and MDB2 backends | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -3/+6 |
| | | | | |||||
* | | | | Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block | Thomas Müller | 2013-07-01 | 1 | -85/+64 |
|\ \ \ \ | | | | | | | | | | | remove unnecessary try catch blocks | ||||
| * | | | | remove unnecessary exception handling | Jörn Friedrich Dreyer | 2013-06-20 | 1 | -85/+64 |
| | | | | | |||||
* | | | | | backport from pull request #3863 | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | 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 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | make mail footer aware of different themes | Björn Schießle | 2013-07-01 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/mail.php | ||||
* | | | | | 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 ↵ | Björn Schießle | 2013-07-01 | 1 | -38/+44 |
| | | | | | | | | | | | | | | | | | | | | strings directly from the theme | ||||
* | | | | | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/templates/admin.php | ||||
* | | | | | Merge pull request #3852 from owncloud/fixing-3830-master | Thomas Müller | 2013-06-30 | 1 | -5/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | session life time is now configurable and set to the same value | ||||
| * | | | | | session_life_time -> session_lifetime | Thomas Mueller | 2013-06-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default session_lifetime is 24hrs recreation of session is triggered at 50% of the session life time | ||||
| * | | | | | session life time is now configurable and set to the same value | Thomas Mueller | 2013-06-26 | 1 | -5/+14 |
| | | | | | | |||||
* | | | | | | Merge pull request #3763 from owncloud/recursive-rmdir | Thomas Müller | 2013-06-30 | 2 | -4/+44 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make rmdir recursive for local storage | ||||
| * | | | | | | make rmdir recursive for mappellocal storage backend | Robin Appelman | 2013-06-30 | 1 | -3/+23 |
| | | | | | | | |||||
| * | | | | | | Make rmdir recursive for local storage | Robin Appelman | 2013-06-17 | 1 | -1/+21 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-30 | 36 | -207/+172 |
| | | | | | | |||||
* | | | | | | Fix review items | Bart Visscher | 2013-06-29 | 7 | -13/+15 |
| | | | | | | |||||
* | | | | | | Fix found errors | Bart Visscher | 2013-06-29 | 6 | -10/+10 |
| | | | | | | |||||
* | | | | | | Fix OCI setupDatabase parameter | Bart Visscher | 2013-06-29 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Remove unsued parameter | Bart Visscher | 2013-06-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Use db setup class for option validation | Bart Visscher | 2013-06-29 | 7 | -35/+43 |
| | | | | | | |||||
* | | | | | | Change database creation to use array to select db setup class | Bart Visscher | 2013-06-29 | 2 | -25/+31 |
| | | | | | | |||||
* | | | | | | Convert database setup code to objects | Bart Visscher | 2013-06-29 | 6 | -179/+210 |
| | | | | | | |||||
* | | | | | | Split database specific install/setup code to their own class | Bart Visscher | 2013-06-29 | 5 | -703/+687 |
| | | | | | | |||||
* | | | | | | Merge pull request #2914 from Kondou-ger/label_overlapping_value | Bart Visscher | 2013-06-29 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix textfield label overlapping value. | ||||
| * | | | | | | Default to localhost, if nothing is entered. | kondou | 2013-05-28 | 1 | -1/+1 |
| | | | | | | |