Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5628 from owncloud/files-fixsummary | VicDeo | 2013-10-30 | 1 | -6/+7 |
|\ | | | | | Fixed summary visibility check | ||||
| * | Fixed summary visibility check | Vincent Petry | 2013-10-30 | 1 | -6/+7 |
| | | | | | | | | | | Now using the integer values to check whether to show the summary parts instead of trying to parse the html code. | ||||
* | | Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick | Vincent Petry | 2013-10-30 | 1 | -1/+5 |
|\ \ | | | | | | | Prevent closing the create dropdown when right clicking in Firefox | ||||
| * | | Prevent closing the create dropdown when right clicking in Firefox | Vincent Petry | 2013-10-30 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | Firefox sends a click event on the document when right clicking which makes pasting with right click into the field impossible. Fixes #5498 | ||||
* | | | Merge pull request #5626 from owncloud/fix_search_in_shared_files | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 |
|\ \ \ | |/ / |/| | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected | ||||
| * | | count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected | Jörn Friedrich Dreyer | 2013-10-30 | 1 | -38/+42 |
| | | | |||||
* | | | Merge pull request #5549 from ↵ | Vincent Petry | 2013-10-30 | 1 | -1/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/encryption-insertmigrationentrywhenmissing Fixed encryption migration when entry is missing in DB | ||||
| * | | | Fixed encryption migration when entry is missing in DB | Vincent Petry | 2013-10-25 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resetting the DB and some users still have encrypted files, the migration state isn't read properly becaue the migration entries are missing. This causes the wrong file size to be returned. This fix inserts the missing migration entry when this condition is met. Fixes #5541 | ||||
* | | | | remove unused variable | Bjoern Schiessle | 2013-10-30 | 1 | -2/+0 |
| | | | | |||||
* | | | | if the database doesn't contain any information about the recovery mode than ↵ | Bjoern Schiessle | 2013-10-30 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | we assume that it is disabled | ||||
* | | | Merge pull request #5616 from owncloud/fixing-l10n-master | Vincent Petry | 2013-10-30 | 5 | -5/+6 |
|\ \ \ | | | | | | | | | Fixing l10n master | ||||
| * | | | replacing ownCloud by theme-able name or avoid it's usage | Thomas Müller | 2013-10-29 | 3 | -3/+4 |
| | | | | |||||
| * | | | avoid usage of brand name 'ownCloud' | Thomas Müller | 2013-10-28 | 2 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #5603 from owncloud/fix_file_cache_updater_master | Vincent Petry | 2013-10-30 | 2 | -21/+48 |
|\ \ \ | | | | | | | | | Fix file cache updater (backport to master of #5513) | ||||
| * \ \ | Merge branch 'master' into fix_file_cache_updater_master | Bjoern Schiessle | 2013-10-29 | 3 | -19/+22 |
| |\ \ \ | |||||
| * | | | | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 2 | -21/+48 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-30 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #5468 from berendt/reworking_OC_Files_Storage_Swift | Thomas Müller | 2013-10-29 | 141 | -485/+8381 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Reworking \OC\Files\Storage\Swift | ||||
| * | | | | settings tags for optional parameters | Christian Berendt | 2013-10-29 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | extended parameter descriptions for Swift | Christian Berendt | 2013-10-29 | 1 | -8/+8 |
| | | | | | |||||
| * | | | | add configuration parameter to manually set the timeout of HTTP requests | Christian Berendt | 2013-10-24 | 3 | -3/+10 |
| | | | | | |||||
| * | | | | make Swift::testLocal workable by using a delimiter | Christian Berendt | 2013-10-23 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Revert "make Swift::testLocal workable by fixing the prefix used with the ↵ | Christian Berendt | 2013-10-23 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object listing in opendir" This reverts commit b92061da5ab2d11f803731628c4304aa8cd302e3. | ||||
| * | | | | make Swift::testLocal workable by fixing the prefix used with the object ↵ | Christian Berendt | 2013-10-23 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | listing in opendir | ||||
| * | | | | rewrite of OC\Files\Storage\Swift | Christian Berendt | 2013-10-22 | 1 | -456/+354 |
| | | | | | |||||
| * | | | | renaming OC\Files\Storage\SWIFT to OC\Files\Storage\Swift | Christian Berendt | 2013-10-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | adapted existing test cases | Christian Berendt | 2013-10-22 | 1 | -12/+33 |
| | | | | | |||||
| * | | | | adjustment of the configuration parameters | Christian Berendt | 2013-10-22 | 2 | -13/+24 |
| | | | | | |||||
| * | | | | added stripped library php-opencloud (version 1.6.0) | Christian Berendt | 2013-10-22 | 136 | -0/+7958 |
| | | | | | |||||
* | | | | | Merge pull request #5606 from owncloud/files-uploaderrorparsingfix | Thomas Müller | 2013-10-29 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Added fix to correctly parse non-array error messages | ||||
| * | | | | | Added fix to correctly parse non-array error messages | Vincent Petry | 2013-10-29 | 1 | -2/+7 |
| | |/ / / | |/| | | | | | | | | | | | | | Some apps like the antivirus app return messages in a non-array format. | ||||
* | | | | | fix style of public share page | Morris Jobke | 2013-10-29 | 1 | -15/+13 |
| | | | | | |||||
* | | | | | Merge pull request #5396 from owncloud/fix-sharing-code | Morris Jobke | 2013-10-29 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix sharing error message - id -> file name | ||||
| * | | | | pass the name of the item source from the browser to the server - no need to ↵ | Thomas Müller | 2013-10-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | get the data via complicated db queries | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-29 | 35 | -34/+463 |
| | | | | | |||||
* | | | | | Fixed clicking on the "Home" breadcrumb in the trash app | Vincent Petry | 2013-10-28 | 1 | -5/+0 |
| |_|/ / |/| | | | | | | | | | | | | | | | Clicking on the "home" breadcrumb now correctly brings the user back to the files app. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 52 | -54/+173 |
| | | | | |||||
* | | | | Fix double not in newfile/newfolder language. | Andreas Fischer | 2013-10-27 | 2 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 188 | -1231/+1207 |
| | | | | |||||
* | | | | Port PR #5457 to master | Arthur Schiwon | 2013-10-25 | 1 | -4/+11 |
| |_|/ |/| | | |||||
* | | | make sure the shared ldap connection is rebound to the configured user after ↵ | Donald Buczek | 2013-10-25 | 1 | -1/+3 |
| | | | | | | | | | | | | being used for password checking. | ||||
* | | | Merge pull request #5532 from owncloud/ldap_fixes | Thomas Müller | 2013-10-24 | 3 | -12/+45 |
|\ \ \ | | | | | | | | | Ldap fixes | ||||
| * | | | LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 | Arthur Schiwon | 2013-10-24 | 1 | -0/+15 |
| | | | | |||||
| * | | | LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520 | Arthur Schiwon | 2013-10-24 | 1 | -10/+28 |
| | | | | |||||
| * | | | LDAP: when multiline values are passed as array, do not try to preg_split ↵ | Arthur Schiwon | 2013-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | them. Fixes #5521 | ||||
| * | | | typo, fixes #5517 | Arthur Schiwon | 2013-10-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5494 from owncloud/fixing-3593-master | Thomas Müller | 2013-10-24 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | ||||
| * | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | Thomas Müller | 2013-10-23 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #5477 from ↵ | Thomas Müller | 2013-10-23 | 7 | -457/+579 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename | ||||
| * | | | | fix translations | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -10/+10 |
| | | | | |