Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-20 | 1 | -0/+18 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-19 | 2 | -0/+5 |
| | |||||
* | Merge pull request #1728 from owncloud/mountconfig | Thomas Müller | 2013-02-18 | 2 | -9/+208 |
|\ | | | | | Use json for new mount configuration files | ||||
| * | merge master into mountconfig | Robin Appelman | 2013-02-18 | 7 | -20/+68 |
| |\ | |||||
| * | | Create new mountconfig files in json | Robin Appelman | 2013-02-16 | 1 | -4/+12 |
| | | | |||||
| * | | Use a parser to read custom mount configuration instead of including the php ↵ | Robin Appelman | 2013-02-16 | 2 | -7/+198 |
| | | | | | | | | | | | | files | ||||
* | | | Merge pull request #1724 from owncloud/long-storage-id | Frank Karlitschek | 2013-02-18 | 2 | -4/+13 |
|\ \ \ | |_|/ |/| | | Cache: hash long storage ids to ensure they fit in the database | ||||
| * | | Cache: hash long storage ids to ensure they fit in the database | Robin Appelman | 2013-02-15 | 2 | -4/+13 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-18 | 3 | -2/+23 |
| | | |||||
* | | Merge pull request #1719 from owncloud/fixing-1659-master | Thomas Müller | 2013-02-17 | 2 | -15/+15 |
|\ \ | | | | | | | Fixing 1659 master | ||||
| * | | class Mapper no respects an unchanged physical root which will be excluded ↵ | Thomas Mueller | 2013-02-15 | 1 | -12/+12 |
| | | | | | | | | | | | | from slugifying the path | ||||
| * | | fix error in recursive search | Thomas Mueller | 2013-02-15 | 1 | -3/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-16 | 2 | -3/+30 |
| |/ |/| | |||||
* | | Fix strict standard warning in user template | Robin Appelman | 2013-02-15 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1715 from owncloud/fixing-1640-master | Thomas Müller | 2013-02-15 | 1 | -1/+1 |
|\ | | | | | changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME | ||||
| * | changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME | Thomas Mueller | 2013-02-15 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1700 from owncloud/fixing-1680-master | Jan-Christoph Borchardt | 2013-02-15 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixing 1680 master | ||||
| * | filter l10n-* files | Thomas Mueller | 2013-02-14 | 1 | -1/+1 |
| | | |||||
* | | we should never drop a database | Thomas Mueller | 2013-02-15 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #1712 from owncloud/debug-exception | Thomas Müller | 2013-02-14 | 1 | -6/+6 |
|\ \ | | | | | | | Don't catch errors/exceptions when debug is enabled | ||||
| * | | set DEBUG from xdebug session before we first use it | Robin Appelman | 2013-02-15 | 1 | -6/+6 |
| | | | |||||
| * | | Don't cache errors/exceptions when debug is enabled | Robin Appelman | 2013-02-15 | 1 | -1/+1 |
| | | | |||||
* | | | Fix quotes in OC_User::isEnabled | Robin Appelman | 2013-02-15 | 1 | -2/+2 |
|/ / | | | | | | | this broke login | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-15 | 4 | -0/+30 |
| | | |||||
* | | Merge pull request #1662 from owncloud/style-cleanup | Bart Visscher | 2013-02-14 | 60 | -387/+814 |
|\ \ | | | | | | | Style cleanup | ||||
| * | | Style-fix: Breakup long lines | Bart Visscher | 2013-02-14 | 51 | -260/+682 |
| | | | |||||
| * | | Whitespace indent fixes | Bart Visscher | 2013-02-14 | 7 | -24/+26 |
| | | | |||||
| * | | Add braces around single line if statements | Bart Visscher | 2013-02-14 | 1 | -3/+6 |
| | | | |||||
| * | | Fix NoSpaceAfterComma and SpaceBeforeComma | Bart Visscher | 2013-02-14 | 12 | -45/+45 |
| | | | |||||
| * | | Fix indentation style | Bart Visscher | 2013-02-14 | 5 | -32/+32 |
| | | | |||||
| * | | Fix SpaceBeforeOpenBrace errors | Bart Visscher | 2013-02-14 | 11 | -23/+23 |
| | | | |||||
* | | | Invalidate existing HSTS headers | Lukas Reschke | 2013-02-14 | 1 | -0/+5 |
| |/ |/| | |||||
* | | adding a compatibility.js as a single source to define all fallback function ↵ | Thomas Mueller | 2013-02-14 | 1 | -0/+1 |
|/ | | | | declarations | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-14 | 5 | -11/+80 |
| | |||||
* | Merge pull request #1598 from owncloud/fixing-1424-master | Thomas Müller | 2013-02-13 | 5 | -47/+88 |
|\ | | | | | Fixing 1424 master | ||||
| * | Merge branch 'master' into fixing-1424-master | Thomas Mueller | 2013-02-13 | 21 | -14/+327 |
| |\ | | | | | | | | | | | | | Conflicts: settings/js/users.js | ||||
| * | | introduce new virtual method hasUserListings() to determine if a user ↵ | Thomas Mueller | 2013-02-11 | 5 | -47/+75 |
| | | | | | | | | | | | | backend can list it's users. | ||||
| * | | Merge branch 'master' into fixing-1424-master | Thomas Mueller | 2013-02-11 | 30 | -86/+184 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into fixing-1424-master | Thomas Müller | 2013-02-09 | 13 | -17/+666 |
| |\ \ \ | |||||
| * | | | | on creation only test for existing users if the backend supports user creation | Thomas Müller | 2013-02-08 | 1 | -1/+14 |
| | | | | | | | | | | | | | | | | | | | | this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth | ||||
* | | | | | alpha 1 | Frank Karlitschek | 2013-02-09 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1 | Lukas Reschke | 2013-02-12 | 3 | -3/+22 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Mapped storage unit testing linux master | ||||
| * | | | | fixing mappedlocal storage to work on non-windows as well | Thomas Mueller | 2013-02-11 | 2 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | this allows us to run unit tests on linux - necessary to enable easy regression testing | ||||
| * | | | | Merge branch 'master' into mapped-storage-unit-testing-linux-master | Thomas Mueller | 2013-02-11 | 22 | -31/+124 |
| |\ \ \ \ | |||||
| * | | | | | make MappedLocal available and testable within Linux as well | Thomas Müller | 2013-02-09 | 2 | -2/+4 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-13 | 3 | -1/+29 |
| | | | | | | |||||
* | | | | | | $this->numericId should be determined based on table storages not filecache | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1616 from owncloud/cache_fixes_rebase | Thomas Müller | 2013-02-12 | 1 | -12/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Cache: reuse known folder sizes when doing a shallow scan - rebase | ||||
| * | | | | | | Cache: fix scanner trying to use existing data when file isn't in cache | Robin Appelman | 2013-02-12 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | fixing syntax error | Thomas Mueller | 2013-02-12 | 1 | -1/+1 |
| | | | | | | |