summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
* | | | 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-302-21/+48
|\ \ \ | | | | | | | | Fix file cache updater (backport to master of #5513)
| * \ \ Merge branch 'master' into fix_file_cache_updater_masterBjoern Schiessle2013-10-293-19/+22
| |\ \ \
| * | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-292-21/+48
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-301-0/+2
| | | | |
* | | | | 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 #5606 from owncloud/files-uploaderrorparsingfixThomas Müller2013-10-291-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Added fix to correctly parse non-array error messages
| * | | | | Added fix to correctly parse non-array error messagesVincent Petry2013-10-291-2/+7
| | |/ / / | |/| | | | | | | | | | | | | Some apps like the antivirus app return messages in a non-array format.
* | | | | fix style of public share pageMorris Jobke2013-10-291-15/+13
| | | | |
* | | | | Merge pull request #5396 from owncloud/fix-sharing-codeMorris Jobke2013-10-291-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üller2013-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | get the data via complicated db queries
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2935-34/+463
| | | | |
* | | | | Fixed clicking on the "Home" breadcrumb in the trash appVincent Petry2013-10-281-5/+0
| |_|/ / |/| | | | | | | | | | | | | | | Clicking on the "home" breadcrumb now correctly brings the user back to the files app.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-2752-54/+173
| | | |
* | | | Fix double not in newfile/newfolder language.Andreas Fischer2013-10-272-2/+2
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-27188-1231/+1207
| | | |
* | | | Port PR #5457 to masterArthur Schiwon2013-10-251-4/+11
| |_|/ |/| |
* | | make sure the shared ldap connection is rebound to the configured user after ↵Donald Buczek2013-10-251-1/+3
| | | | | | | | | | | | being used for password checking.
* | | Merge pull request #5532 from owncloud/ldap_fixesThomas Müller2013-10-243-12/+45
|\ \ \ | | | | | | | | Ldap fixes
| * | | LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518Arthur Schiwon2013-10-241-0/+15
| | | |
| * | | LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520Arthur Schiwon2013-10-241-10/+28
| | | |
| * | | LDAP: when multiline values are passed as array, do not try to preg_split ↵Arthur Schiwon2013-10-241-1/+1
| | | | | | | | | | | | | | | | them. Fixes #5521
| * | | typo, fixes #5517Arthur Schiwon2013-10-241-1/+1
| | | |
* | | | Merge pull request #5494 from owncloud/fixing-3593-masterThomas Müller2013-10-241-0/+1
|\ \ \ \ | |/ / / |/| | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
| * | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}idThomas Müller2013-10-231-0/+1
| | | |
* | | | Merge pull request #5477 from ↵Thomas Müller2013-10-237-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 translationsJörn Friedrich Dreyer2013-10-232-10/+10
| | | | |