summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-0336-88/+220
|
* Merge pull request #13822 from owncloud/include-core-version-in-js-version-tagThomas Müller2015-02-021-2/+4
|\ | | | | include core version into js/css version tag
| * include core version into js/css version tag - fixes #13702Thomas Müller2015-02-021-2/+4
| |
* | Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-023-4/+7
|\ \ | | | | | | encryption requires openssl and user_ldap requires ldap :speak_no_evil:
| * | add libs which have no version numberThomas Müller2015-02-021-4/+1
| | |
| * | encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-022-0/+6
| | |
* | | Merge pull request #13811 from owncloud/default-to-nullLukas Reschke2015-02-022-29/+39
|\ \ \ | |_|/ |/| | Default to `null` for lostpassword
| * | Mock l10n in the setupLukas Reschke2015-02-011-26/+23
| | |
| * | Add unit tests for empty tokenLukas Reschke2015-02-012-3/+16
| | |
| * | Default to `null` for lostpasswordLukas Reschke2015-02-011-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-groupThomas Müller2015-02-025-66/+657
|\ \ \ | | | | | | | | Fix subadmin listing of group
| * | | Consistent variable namingLukas Reschke2015-01-301-10/+9
| | | |
| * | | Switch to a factory and add unit testsLukas Reschke2015-01-304-58/+443
| | | |
| * | | Add unit testsLukas Reschke2015-01-304-19/+211
| | | |
| * | | Fix subadmin listing of groupLukas Reschke2015-01-301-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | Without this patch filtering for the "_everyone" (empty) group did not work for subadmins. Fixes itself.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0220-44/+62
| | | |
* | | | Merge pull request #13810 from owncloud/tdomainThomas Müller2015-02-011-2/+2
|\ \ \ \ | |_|/ / |/| | | fix trusted domain localization
| * | | fix trusted domain localizationVolkan Gezer2015-02-011-2/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0112-4/+28
| | |
* | | Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-313-3/+3
|\ \ \ | | | | | | | | make sure that we get the correct user from the path
| * | | no need to initialize the same view twiceBjoern Schiessle2015-01-301-1/+0
| | | |
| * | | get correct user for paths to the trash bin, needed for remote shares if the ↵Bjoern Schiessle2015-01-302-2/+3
| | | | | | | | | | | | | | | | size of of trash gets calculated
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3160-178/+296
| | | |
* | | | 8.0.0 RC1v8.0.0RC1Frank Karlitschek2015-01-281-2/+2
| |_|/ |/| |
* | | Merge pull request #13804 from owncloud/check-return-before-assuming-arrayJoas Schilling2015-01-301-8/+12
|\ \ \ | |_|/ |/| | Check whether return is an error case before using it
| * | Check whether return is an error case before using itJoas Schilling2015-01-301-8/+12
|/ /
* | Merge pull request #13508 from owncloud/failed-delete-cacheMorris Jobke2015-01-305-7/+72
|\ \ | |/ |/| Dont remove a file from cache if the delete operation failed
| * Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-292-3/+5
| |
| * Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
| |
| * Detect failed deletes in the trashbinRobin Appelman2015-01-292-3/+41
| |
| * Dont remove a file from cache if the delete operation failedRobin Appelman2015-01-292-1/+24
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-3092-106/+114
| |
* | Merge pull request #13774 from owncloud/fix-exception-cssRobin McCorkell2015-01-291-0/+2
|\ \ | | | | | | add CSS to exception page - fixes #13747
| * | add CSS to exception page - fixes #13747Morris Jobke2015-01-291-0/+2
| | |
* | | Merge pull request #13772 from owncloud/closecursor-allconfigVincent Petry2015-01-291-0/+1
|\ \ \ | |/ / |/| | Close cursor after checking for existing config values
| * | Close cursor after checking for existing config valuesVincent Petry2014-11-281-0/+1
| | |
* | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-293-66/+145
|\ \ \ | |/ / |/| | make sure that we always create a public share key for remote shares
| * | Fix intendationJoas Schilling2015-01-291-3/+3
| | |
| * | Fix more assertionsJoas Schilling2015-01-291-26/+26
| | |
| * | Fix 2 assertionsJoas Schilling2015-01-291-3/+3
| | |
| * | make sure that we always create a public share key for remote sharesBjoern Schiessle2015-01-293-41/+120
| | |
* | | Merge pull request #13728 from owncloud/federated_cloudThomas Müller2015-01-292-5/+5
|\ \ \ | |_|/ |/| | rename 'server-to-server sharing' to 'federated cloud'
| * | rename 'server-to-server sharing' to 'federated cloud'Bjoern Schiessle2015-01-292-5/+5
| |/
* | Merge pull request #13757 from ↵Lukas Reschke2015-01-291-1/+1
|\ \ | | | | | | | | | | | | owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces Scroll to file in folder, when using "search in other places" link
| * | Scroll to file in folder, when using "search in other places" linkJoas Schilling2015-01-291-1/+1
| | |
* | | Merge pull request #13762 from owncloud/ignore_trailing_slashBjörn Schießle2015-01-291-0/+1
|\ \ \ | | | | | | | | ignore trailing slash for remote URL
| * | | remove trailing slashBjoern Schiessle2015-01-291-0/+1
| | |/ | |/|
* | | Merge pull request #13752 from owncloud/closecursor1Morris Jobke2015-01-292-0/+4
|\ \ \ | | | | | | | | Close cursor early in calculateFolderSize
| * | | Close cursor early in calculateFolderSizeVincent Petry2014-11-282-0/+4
| | |/ | |/| | | | | | | | | | This method triggers additional queries in $this->update() so to avoid potential database locks or delays, we close the cursor as soon as it is not needed any more
* | | Merge pull request #13682 from owncloud/webdav-single-file-putMorris Jobke2015-01-294-4/+45
|\ \ \ | | | | | | | | Fix WebDAV put for single file shares
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 04:13:57 +0000