Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint | Björn Schießle | 2015-02-04 | 2 | -0/+27 |
|\ | | | | | detect root of mountpoint also if the trailing slash is missed | ||||
| * | detect root of mountpoint also if the trailing slash is missed | Bjoern Schiessle | 2015-02-04 | 2 | -0/+27 |
| | | |||||
* | | Merge pull request #13849 from owncloud/ldap-oc8-update | blizzz | 2015-02-04 | 2 | -49/+1 |
|\ \ | | | | | | | no update routine needed from OC 7 to 8 | ||||
| * | | no update routine needed from OC 7 to 8 | Arthur Schiwon | 2015-02-03 | 2 | -49/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-04 | 26 | -32/+226 |
| | | | |||||
* | | | Merge pull request #13843 from owncloud/fix-files-disabled | Thomas Müller | 2015-02-03 | 5 | -2/+65 |
|\ \ \ | |_|/ |/| | | Fix disabled files app | ||||
| * | | enabled disabled files app in repair step | Morris Jobke | 2015-02-03 | 4 | -2/+54 |
| | | | |||||
| * | | Disallow disabling of files app | Morris Jobke | 2015-02-03 | 3 | -2/+13 |
| | | | |||||
* | | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptions | Thomas Müller | 2015-02-03 | 1 | -0/+22 |
|\ \ \ | |_|/ |/| | | Fix DAV exceptions, some will still return false now | ||||
| * | | Fix DAV exceptions, some will still return false now | Vincent Petry | 2015-01-30 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | Since the Storage interface isn't ready to work directly with exceptions like Forbidden and NotFound, the DAV storage has been adapted to still return false when expected. | ||||
* | | | Merge pull request #13837 from owncloud/endless-redirect | Thomas Müller | 2015-02-03 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Add callCheck to testremote.php | ||||
| * | | | Add callCheck to testremote.php | Lukas Reschke | 2015-02-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-03 | 36 | -88/+220 |
|/ / / | |||||
* | | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag | Thomas Müller | 2015-02-02 | 1 | -2/+4 |
|\ \ \ | |_|/ |/| | | include core version into js/css version tag | ||||
| * | | include core version into js/css version tag - fixes #13702 | Thomas Müller | 2015-02-02 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #13817 from owncloud/core-apps-dependencies | Morris Jobke | 2015-02-02 | 3 | -4/+7 |
|\ \ \ | | | | | | | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil: | ||||
| * | | | add libs which have no version number | Thomas Müller | 2015-02-02 | 1 | -4/+1 |
| | | | | |||||
| * | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil: | Thomas Müller | 2015-02-02 | 2 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #13811 from owncloud/default-to-null | Lukas Reschke | 2015-02-02 | 2 | -29/+39 |
|\ \ \ \ | |_|/ / |/| | | | Default to `null` for lostpassword | ||||
| * | | | Mock l10n in the setup | Lukas Reschke | 2015-02-01 | 1 | -26/+23 |
| | | | | |||||
| * | | | Add unit tests for empty token | Lukas Reschke | 2015-02-01 | 2 | -3/+16 |
| | | | | |||||
| * | | | Default to `null` for lostpassword | Lukas Reschke | 2015-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | We oC 8 we use the `StringUtils::equals` method which will also verify the type, since we don't anylonger hash the token twice this is required in case somebody is able to invoke this route with an empty `$token`. | ||||
* | | | | Merge pull request #13790 from owncloud/fix-subadmin-group | Thomas Müller | 2015-02-02 | 5 | -66/+657 |
|\ \ \ \ | | | | | | | | | | | Fix subadmin listing of group | ||||
| * | | | | Consistent variable naming | Lukas Reschke | 2015-01-30 | 1 | -10/+9 |
| | | | | | |||||
| * | | | | Switch to a factory and add unit tests | Lukas Reschke | 2015-01-30 | 4 | -58/+443 |
| | | | | | |||||
| * | | | | Add unit tests | Lukas Reschke | 2015-01-30 | 4 | -19/+211 |
| | | | | | |||||
| * | | | | Fix subadmin listing of group | Lukas Reschke | 2015-01-30 | 1 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch filtering for the "_everyone" (empty) group did not work for subadmins. Fixes itself. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-02 | 20 | -44/+62 |
| | | | | | |||||
* | | | | | Merge pull request #13810 from owncloud/tdomain | Thomas Müller | 2015-02-01 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | fix trusted domain localization | ||||
| * | | | | fix trusted domain localization | Volkan Gezer | 2015-02-01 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-01 | 12 | -4/+28 |
| | | | | |||||
* | | | | Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares | Lukas Reschke | 2015-01-31 | 3 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | make sure that we get the correct user from the path | ||||
| * | | | | no need to initialize the same view twice | Bjoern Schiessle | 2015-01-30 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | get correct user for paths to the trash bin, needed for remote shares if the ↵ | Bjoern Schiessle | 2015-01-30 | 2 | -2/+3 |
| | |_|/ | |/| | | | | | | | | | | size of of trash gets calculated | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-31 | 60 | -178/+296 |
| | | | | |||||
* | | | | 8.0.0 RC1v8.0.0RC1 | Frank Karlitschek | 2015-01-28 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #13804 from owncloud/check-return-before-assuming-array | Joas Schilling | 2015-01-30 | 1 | -8/+12 |
|\ \ \ | |_|/ |/| | | Check whether return is an error case before using it | ||||
| * | | Check whether return is an error case before using it | Joas Schilling | 2015-01-30 | 1 | -8/+12 |
|/ / | |||||
* | | Merge pull request #13508 from owncloud/failed-delete-cache | Morris Jobke | 2015-01-30 | 5 | -7/+72 |
|\ \ | |/ |/| | Dont remove a file from cache if the delete operation failed | ||||
| * | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 2 | -3/+5 |
| | | |||||
| * | Make sure we delete the file when doing a cross storage trashbin move | Robin Appelman | 2015-01-29 | 1 | -0/+2 |
| | | |||||
| * | Detect failed deletes in the trashbin | Robin Appelman | 2015-01-29 | 2 | -3/+41 |
| | | |||||
| * | Dont remove a file from cache if the delete operation failed | Robin Appelman | 2015-01-29 | 2 | -1/+24 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-30 | 92 | -106/+114 |
| | | |||||
* | | Merge pull request #13774 from owncloud/fix-exception-css | Robin McCorkell | 2015-01-29 | 1 | -0/+2 |
|\ \ | | | | | | | add CSS to exception page - fixes #13747 | ||||
| * | | add CSS to exception page - fixes #13747 | Morris Jobke | 2015-01-29 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #13772 from owncloud/closecursor-allconfig | Vincent Petry | 2015-01-29 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Close cursor after checking for existing config values | ||||
| * | | Close cursor after checking for existing config values | Vincent Petry | 2014-11-28 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 3 | -66/+145 |
|\ \ \ | |/ / |/| | | make sure that we always create a public share key for remote shares | ||||
| * | | Fix intendation | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | |