Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Add update permissions hook to sharing | Michael Gapczynski | 2013-07-08 | 1 | -0/+9 | |
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #3954 from owncloud/update_insertifnotexist_and_test | Thomas Müller | 2013-07-08 | 1 | -6/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | update comment | Jörn Friedrich Dreyer | 2013-07-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | fix insertIfNotExist return value, update doc and corresponding test | Jörn Friedrich Dreyer | 2013-07-05 | 1 | -5/+2 | |
* | | | | | | | | | | | | Merge pull request #3946 from owncloud/fixing-3942-master | Thomas Müller | 2013-07-08 | 1 | -11/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | removing unused getSharedItem() | Thomas Müller | 2013-07-06 | 1 | -11/+0 | |
| * | | | | | | | | | | | | Merge branch 'master' into fixing-3942-master | Thomas Müller | 2013-07-06 | 2 | -1/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | on reshares we now recursively move to the root of all reshares - therefore s... | Thomas Müller | 2013-07-05 | 1 | -0/+23 | |
* | | | | | | | | | | | | | | Merge https://github.com/owncloud/core/pull/3827 | Björn Schießle | 2013-07-08 | 3 | -16/+26 | |
* | | | | | | | | | | | | | | [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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | 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') | 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 | |
* | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 | |
* | | | | | | | | | | 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 use it for the encryption app to reset mig... | Björn Schießle | 2013-06-27 | 1 | -0/+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 | |
* | | | | | | | | | | Merge pull request #3775 from owncloud/test_fixes_for_dbschema | Thomas Müller | 2013-07-01 | 1 | -17/+24 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | isError should detect a PEAR_Error even if the backend is PDO. | Thomas Mueller | 2013-06-28 | 1 | -19/+23 | |
| * | | | | | | | | | | 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 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 | |
* | | | | | | | | | | | 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 | |
* | | | | | | | | | | | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 1 | -1/+23 | |
* | | | | | | | | | | | Merge pull request #3852 from owncloud/fixing-3830-master | Thomas Müller | 2013-06-30 | 1 | -5/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | session_life_time -> session_lifetime | Thomas Mueller | 2013-06-28 | 1 | -2/+2 | |
| * | | | | | | | | | | | 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 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 |