summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstepMorris Jobke2015-01-143-1/+260
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a repair step to clean up orphan tags and tag entries
| * | | | | | | | | Add a repair step to clean up orphan tags and tag entriesJoas Schilling2015-01-143-1/+260
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13367 from owncloud/type-hint-server-method-from-requestMorris Jobke2015-01-141-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Add PHPDoc for magic property 'server'
| * | | | | | | | Add PHPDoc for magic property 'server'Lukas Reschke2015-01-141-1/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #13350 from owncloud/autoload-translationsMorris Jobke2015-01-149-11/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Autoload app's js translations
| * | | | | | | | ignore coreBernhard Posselt2015-01-141-1/+4
| | | | | | | | |
| * | | | | | | | move check into addTranslation methodBernhard Posselt2015-01-141-11/+1
| | | | | | | | |
| * | | | | | | | dont load core scritpsBernhard Posselt2015-01-141-1/+3
| | | | | | | | |
| * | | | | | | | Remove unneeded addTranslations() callsVincent Petry2015-01-148-11/+0
| | | | | | | | |
| * | | | | | | | only load translsations for appsBernhard Posselt2015-01-141-1/+3
| | | | | | | | |
| * | | | | | | | make translation lookup faster (O(n) -> O(1))Bernhard Posselt2015-01-141-2/+2
| | | | | | | | |
| * | | | | | | | autoload app's js translationsBernhard Posselt2015-01-141-0/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #13351 from owncloud/check-for-existenceLukas Reschke2015-01-141-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Check for existence of $_GET keys
| * | | | | | | | | Check for existence of $_GET keysLukas Reschke2015-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `$dir` may for example very well not get passed at well.
* | | | | | | | | | Merge pull request #13349 from owncloud/kill-deprecated-code-sharingThomas Müller2015-01-143-50/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | remove deprecated code - fixes #13119
| * | | | | | | | | remove deprecated code - fixes #13119Thomas Müller2015-01-143-50/+51
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13348 from owncloud/fix-app-required-oc-version-checkMorris Jobke2015-01-143-4/+59
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Check new and old ways of required oC version for app compatibility
| * | | | | | | | Check new and old ways of required oC version for app compatibilityJoas Schilling2015-01-143-4/+59
| | | | | | | | |
* | | | | | | | | Merge pull request #13345 from owncloud/increase-files-external-versionsMorris Jobke2015-01-142-2/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Increase files_externals oC required version and its own version
| * | | | | | | | Increase files_externals oC required version and its own versionJoas Schilling2015-01-142-2/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #13341 from owncloud/update-readversionfromtemplateMorris Jobke2015-01-142-5/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Read version and product name from update template
| * | | | | | | Read version and product name from update templateVincent Petry2015-01-142-5/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During upgrade, the config settings aren't always available due to base.php changes. This fix makes the update info page read the product name and version from the update template, which already had them.
* | | | | | | Merge pull request #13332 from oparoz/fix-download-buttonThomas Müller2015-01-141-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Download the current public folder only
| * | | | | | | Download the current public folder onlyOlivier Paroz2015-01-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From within a shared/public directory, when drilling down folders, some users want to be able to download what they're currently looking at, not the whole shared folder. The whole archive is always a click away anyway since a user can click on the home button.
* | | | | | | | Merge pull request #13286 from owncloud/sharing_upgradeBjörn Schießle2015-01-144-1/+131
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | update script for new server-to-server sharing
| * | | | | | | | set accept to 1 (=true) for all server-to-server shares on update, at this ↵Bjoern Schiessle2015-01-134-1/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table
* | | | | | | | | Merge pull request #13288 from owncloud/enc_fix_public_downloadLukas Reschke2015-01-143-25/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [encryption] fix download of public shared files
| * | | | | | | | | if we download a public shared file we need to retrieve the user from the pathBjoern Schiessle2015-01-133-25/+14
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13335 from owncloud/disable-rememberme-files-externalThomas Müller2015-01-141-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | The files_external app might need the password so autologin must be disabled
| * | | | | | | | | The files_external app might need the password so autologin must be disabledJoas Schilling2015-01-141-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #13311 from owncloud/fix_restore_keysBjörn Schießle2015-01-145-42/+145
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | adapt decrypt all to the new folder structure
| * | | | | | | | adapt decrypt all and restore/delete key backups to the new folder structure ↵Bjoern Schiessle2015-01-135-42/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for encryption key introduced with OC8
* | | | | | | | | Merge pull request #13325 from owncloud/kill-strip-slashesMorris Jobke2015-01-145-9/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Get rid of `stripslashes()`
| * | | | | | | | | Get rid of `stripslashes()`Lukas Reschke2015-01-135-9/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | This conversions are actually totally unneeded and probably left-overs from ages where the safe_mode was still a valid thing.
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-14176-12/+452
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #13320 from owncloud/fix-php-doc-for-files-viewMorris Jobke2015-01-131-1/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix annotations in file view
| * | | | | | | drop unused parameterMorris Jobke2015-01-131-2/+1
| | | | | | | |
| * | | | | | | Fix annotations in file viewLukas Reschke2015-01-131-0/+11
| |/ / / / / /
* | | | | | | Merge pull request #13318 from owncloud/fix-annotationMorris Jobke2015-01-131-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix PHP doc and enforce type
| * | | | | | | Fix PHP doc and enforce typeLukas Reschke2015-01-131-3/+3
| |/ / / / / /
* | | | | | | Merge pull request #13316 from owncloud/drop-dead-codeMorris Jobke2015-01-131-4/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | drop dead code - ref #13301
| * | | | | | drop dead code - ref #13301Morris Jobke2015-01-131-4/+0
|/ / / / / /
* | | | | | Merge pull request #13217 from owncloud/make-basic-auth-work-againBernhard Posselt2015-01-131-13/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Basic Auth in master for applications
| * | | | | | Add some more sanity checks for maintenance modeLukas Reschke2015-01-091-1/+3
| | | | | | |
| * | | | | | Verify authentication before initializing apps and routingLukas Reschke2015-01-091-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current behaviour of the authenticion logic in base.php prevents REST APIs in ownCloud applications to work. Because `!self::$CLI` is usually always a true statement the previously above block was entered which returned, thus the authentication logic for this part does not trigger in. This can be reproduced by installing apps such as the News app and issuing the following command: `curl -u admin:admin http://localhost/index.php/apps/news/api/v1-2/feeds` The following parts needs to get throughly tested: - [ ] OCS - [ ] remote.php's DAV features - [ ] Regular login features This bug affects master and stable7. I'd propose that we merge this for 8.0 since this has the potential to break every component that relies on Basic Auth features. A backport would also be very nice. Remark to myself: We really need to move out the authentication code for 8.1 out of base.php - I already have a local branch that does that somewhere which I will get in shape for 8.1... - This untested code is a night-mare. Fixes itself.
* | | | | | | Merge pull request #13291 from owncloud/node-searchcommonbasepathfixThomas Müller2015-01-132-0/+40
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Fix searchCommon to properly match path name
| * | | | | | Fix searchCommon to properly match path nameVincent Petry2015-01-122-0/+40
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal path was matched without the last "/" which caused "files_trashbin" to also match when the internal path was "files". This adds the missing slash for the comparison.
* | | | | | Merge pull request #13277 from owncloud/pasteurlJoas Schilling2015-01-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | add https:// placeholder for From Link feature. closes #13255
| * | | | | | add https:// placeholder for From Link feature. closes #13255Volkan Gezer2015-01-121-1/+1
| | | | | | |
* | | | | | | Merge pull request #13301 from owncloud/drop-etag-messageVincent Petry2015-01-131-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | drop useless "!!! No reuse of etag" - fixes #13187
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 21:33:01 +0000