aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into home-storageThomas Müller2013-10-30738-6458/+15220
|\
| * Merge pull request #5615 from owncloud/fixing-5614-masterLukas Reschke2013-10-301-1/+2
| |\ | | | | | | http header OCS-ApiRequest: true is required in case of session based OC...
| | * Added missing HTTP prefix to the $_SERVER variableLukas Reschke2013-10-301-1/+1
| | |
| | * http header OCS-ApiRequest: true is required in case of session based OCS ↵Thomas Müller2013-10-291-1/+2
| | | | | | | | | | | | API calls
| * | Merge pull request #5628 from owncloud/files-fixsummaryVicDeo2013-10-301-6/+7
| |\ \ | | | | | | | | Fixed summary visibility check
| | * | Fixed summary visibility checkVincent Petry2013-10-301-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-createdropdownstayswithrightclickVincent Petry2013-10-301-1/+5
| |\ \ \ | | | | | | | | | | Prevent closing the create dropdown when right clicking in Firefox
| | * | | Prevent closing the create dropdown when right clicking in FirefoxVincent Petry2013-10-301-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 #5632 from owncloud/allow_nested_link_sharesVincent Petry2013-10-301-2/+4
| |\ \ \ \ | | | | | | | | | | | | allow nested link shares
| | * | | | allow to share a file/folder as public link also if one of it parents was ↵Bjoern Schiessle2013-10-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | already shared as link
| * | | | | Merge pull request #5625 from owncloud/fix-test-masterJörn Friedrich Dreyer2013-10-301-7/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | fix failing preview test on master
| | * | | | | fix failing preview test on masterMorris Jobke2013-10-301-7/+5
| | |/ / / /
| * | | | | Merge pull request #5626 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2013-10-301-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 expectedJörn Friedrich Dreyer2013-10-301-38/+42
| | | | | |
| * | | | | Merge pull request #5549 from ↵Vincent Petry2013-10-301-1/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/encryption-insertmigrationentrywhenmissing Fixed encryption migration when entry is missing in DB
| | * | | | | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-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
| * | | | | | Merge pull request #5602 from owncloud/update-parent-storage-mtimeThomas Müller2013-10-302-2/+52
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Prevent rescans of folders by updating the parent's storage_mtime
| | * | | | | Merge branch 'master' into update-parent-storage-mtimeRobin Appelman2013-10-30327-4904/+12915
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: lib/private/files/cache/updater.php
| * | | | | | Merge pull request #5618 from owncloud/set_default_value_for_recovery_modeBjörn Schießle2013-10-301-3/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | [encryption] add defaut value to getValue() call
| | * | | | | remove unused variableBjoern Schiessle2013-10-301-2/+0
| | | | | | |
| | * | | | | if the database doesn't contain any information about the recovery mode than ↵Bjoern Schiessle2013-10-301-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | we assume that it is disabled
| * | | | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-305-5/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixing l10n master
| | * | | | | replacing ownCloud by theme-able name or avoid it's usageThomas Müller2013-10-293-3/+4
| | | | | | |
| | * | | | | avoid usage of brand name 'ownCloud'Thomas Müller2013-10-282-2/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #5603 from owncloud/fix_file_cache_updater_masterVincent Petry2013-10-304-33/+105
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix file cache updater (backport to master of #5513)
| | * \ \ \ \ Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-2911-68/+129
| | |\ \ \ \ \
| | * | | | | | make sure that also the storage etag gets changedBjoern Schiessle2013-10-291-4/+7
| | | | | | | |
| | * | | | | | make getUidAndFilename() privateBjoern Schiessle2013-10-291-1/+1
| | | | | | | |
| | * | | | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-294-33/+102
| | | | | | | |
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-30162-4302/+4246
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix typoLukas Reschke2013-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | Whooah! - I'm even committing this total important change without peer review ;-)
| * | | | | | Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta2Frank Karlitschek2013-10-28142-488/+8384
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #5468 from berendt/reworking_OC_Files_Storage_SwiftThomas Müller2013-10-29141-485/+8381
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Reworking \OC\Files\Storage\Swift
| | | * | | | | | settings tags for optional parametersChristian Berendt2013-10-291-5/+5
| | | | | | | | |
| | | * | | | | | extended parameter descriptions for SwiftChristian Berendt2013-10-291-8/+8
| | | | | | | | |
| | | * | | | | | add configuration parameter to manually set the timeout of HTTP requestsChristian Berendt2013-10-243-3/+10
| | | | | | | | |
| | | * | | | | | make Swift::testLocal workable by using a delimiterChristian Berendt2013-10-231-1/+2
| | | | | | | | |
| | | * | | | | | Revert "make Swift::testLocal workable by fixing the prefix used with the ↵Christian Berendt2013-10-231-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object listing in opendir" This reverts commit b92061da5ab2d11f803731628c4304aa8cd302e3.
| | | * | | | | | make Swift::testLocal workable by fixing the prefix used with the object ↵Christian Berendt2013-10-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listing in opendir
| | | * | | | | | rewrite of OC\Files\Storage\SwiftChristian Berendt2013-10-221-456/+354
| | | | | | | | |
| | | * | | | | | renaming OC\Files\Storage\SWIFT to OC\Files\Storage\SwiftChristian Berendt2013-10-221-1/+1
| | | | | | | | |
| | | * | | | | | adapted existing test casesChristian Berendt2013-10-221-12/+33
| | | | | | | | |
| | | * | | | | | adjustment of the configuration parametersChristian Berendt2013-10-222-13/+24
| | | | | | | | |
| | | * | | | | | added stripped library php-opencloud (version 1.6.0)Christian Berendt2013-10-22136-0/+7958
| | | | | | | | |
| | * | | | | | | Merge pull request #5609 from owncloud/fix_delete_user2Thomas Müller2013-10-291-3/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | use getHome() to delete users data
| | | * | | | | | | use getHome() to delete users dataBjoern Schiessle2013-10-291-3/+3
| | |/ / / / / / /
| * / / / / / / / beta 2Frank Karlitschek2013-10-281-2/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #5592 from owncloud/lost_password_screenThomas Müller2013-10-292-5/+44
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Fixing lost password-screen
| | * | | | | | fix lost password screen - reuse available CSS rulesMorris Jobke2013-10-292-10/+20
| | | | | | | |
| | * | | | | | Fixing the lost Password ScreenJulian Müller2013-10-291-1/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-15 08:05:27 +0000