Commit Graph

23365 Commits

Author SHA1 Message Date
Thomas Müller 7cd3f17d9c Merge pull request #14311 from raimund-schluessler/Fix#14310
Fix #14310
2015-02-19 16:17:19 +01:00
Thomas Müller 6e4fa80fe6 Merge pull request #14377 from owncloud/port-14041
Port of #14041 to master
2015-02-19 15:49:30 +01:00
Arthur Schiwon 7ada41259c Port of #14041 to master
on ownCloud upgrade: upgrade all apps in order, load important ones

Fix "other" app update stack
2015-02-19 14:38:22 +01:00
Morris Jobke 0e47d1fcca Merge pull request #14338 from owncloud/fix-nav-heigt
If no link text has been set for the navigation show the link nonetheless
2015-02-19 13:11:53 +01:00
Joas Schilling e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Thomas Müller 84eb00e428 Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view
Disallow path traversals in file view
2015-02-19 10:27:04 +01:00
Jenkins for ownCloud 294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Lukas Reschke 4decbc2efa Add `Satisfy All`
Fixes https://github.com/owncloud/core/issues/14356
2015-02-19 02:16:44 +01:00
Thomas Müller b32d31a2f1 Merge pull request #13836 from owncloud/part-no-cache-update
Dont update the cache when working with part files
2015-02-19 00:08:10 +01:00
Robin Appelman 3632962000 Make the search box filter apps 2015-02-19 00:01:03 +01:00
Thomas Müller 88126498a0 Merge pull request #14349 from owncloud/contributetrackerupdate
add documentation issue trackers and use https everywhere
2015-02-18 20:43:16 +01:00
Jan-Christoph Borchardt 83bc951630 Merge pull request #12213 from sebomoto/add-loadfeedback
Add loadfeedback
2015-02-18 19:42:18 +01:00
Volkan Gezer 74ed727b5f add documentation issue trackers and use https everywhere 2015-02-18 19:13:49 +01:00
Lukas Reschke 46ca0fa481 Add some basic PHPDoc to functions 2015-02-18 18:17:33 +01:00
Lukas Reschke 41e5850450 Prevent directory traversals in ctr of \OC\Files\View
This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.
2015-02-18 18:17:33 +01:00
Clark Tomlinson 8d09cc3b91 Merge pull request #13989 from owncloud/enhancment/security/11857
Allow AppFramework applications to specify a custom CSP header
2015-02-18 10:27:29 -05:00
Clark Tomlinson 84cc90a0ee Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult
Fix invalid `ini_set` directives
2015-02-18 10:06:12 -05:00
AW-UC 097d455213 provide case-insensitive natural sorting
This makes OC's naturalsort_defaultcollator case-insensitive
2015-02-18 15:49:03 +01:00
Lukas Reschke e4bf3fcb53 Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation
Revert "add debug log for memcache instantiation"
2015-02-18 15:45:38 +01:00
Clark Tomlinson c4fdb9cc24 Merge pull request #14324 from owncloud/fix/14320
Check if instance is not yet installed
2015-02-18 09:40:32 -05:00
Bernhard Posselt a5074fa629 if no link text has been set for the navigation show the link nonetheless 2015-02-18 15:34:31 +01:00
Lukas Reschke 593681a4a9 Fix invalid `ini_set` directives
Somehow they got messed up. Because PHP does automatic type juggling this has worked before as well however it's not guaranteed that this might work in the future as well.
2015-02-18 15:18:27 +01:00
Vincent Petry 610761d1f7 Merge pull request #14211 from owncloud/activity/225-files-extension-jenkins
Activity/225 Move displaying of files related activities to files app
2015-02-18 14:47:15 +01:00
Vincent Petry 837365fff2 Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins
Activity/225 sharing extension
2015-02-18 14:46:58 +01:00
Robin Appelman 5542fafd36 allow overwriting the appmanager in oc_util by subclassing 2015-02-18 14:24:50 +01:00
Joas Schilling eaccd2a72a Remove unnecessary backslashes from translations 2015-02-18 14:17:53 +01:00
Lukas Reschke cd4c064ebf Revert "add debug log for memcache instantiation" 2015-02-18 14:16:14 +01:00
Lukas Reschke a666f804c7 Use the untrusted domain in the installer 2015-02-18 13:59:37 +01:00
Joas Schilling 602845f33e Correctly create the expected key for plurals with quotes
Ported from the administration repo:
c67eaa11c0
and
41b0f9fa3a
2015-02-18 13:22:06 +01:00
Lukas Reschke 1a41f8f6f9 Check if instance is not yet installed
Due to a security hardening in 8.1 a missing value of empty trusted domains in the config would provoke an error as this was misused by a lot of users.

This caused a problem where the initial installation happened from another domain than 127.0.0.1 as in this case the domain was considered untrusted as no value was defined. However, this special case should not get intercepted.

To test:
- [ ] Installing ownCloud on 127.0.0.1 works
- [ ] Installing ownCloud on another domain / IP works
- [ ] When setting up ownCloud from 127.0.0.1 and accessing it from the domain above the trusted domain error should be shown if not specified in the config

Fixes https://github.com/owncloud/core/issues/14320
2015-02-18 13:06:46 +01:00
cmeh 46c34d6867 Cleaning-up messages
**Changes:**

* In line 103, the middle "c" of "owncloud" is capitalised to "ownCloud".
* A space is inserted between value and unit in lines 177 and 187 ("4 GB" instead of "4GB").
2015-02-18 12:26:42 +01:00
Thomas Müller caa6d3e2db Merge pull request #13857 from owncloud/phpseclib-0.3.9
Update phpseclib to version 0.3.9.
2015-02-18 10:17:34 +01:00
Thomas Müller 2b1f39cd6b Merge pull request #14308 from owncloud/fix-14247
Add mapping for a broken varchar type.
2015-02-18 10:05:33 +01:00
Jenkins for ownCloud b9c39b60ec [tx-robot] updated from transifex 2015-02-18 01:55:40 -05:00
Andreas Fischer c640e2fa66 Update phpseclib to version 0.3.9. 2015-02-18 01:16:23 +01:00
Lukas Reschke ceaa193df2 Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6
Use APCu only if available in version 4.0.6 and higher
2015-02-18 01:07:54 +01:00
Morris Jobke 5d7d2adcbf Merge pull request #14207 from owncloud/propfind-optimize
Optimize quota calculation for propfind
2015-02-18 00:18:47 +01:00
Raimund Schlüßler 958c1858f8 Fix #14310 2015-02-17 21:48:10 +01:00
Daniel Hansson c652d3077c Merge pull request #14293 from owncloud/issue/14270-fix-public-share-download-activities
Correctly create activities for public downloads
2015-02-17 21:41:40 +01:00
Victor Dubiniuk 090db867d5 Add mapping for a broken varchar type. Fixes #14247 2015-02-17 23:22:57 +03:00
Joas Schilling 0833a6e332 Correctly create activities for public downloads 2015-02-17 17:26:03 +01:00
Lukas Reschke 3213b04aef Check if the offset exists before accessing
This checks if the offset exists before accessing it and also adds unit tests to this function which would have catched this before 🙈

Fixes https://github.com/owncloud/core/issues/14277
2015-02-17 17:08:23 +01:00
Clark Tomlinson ac13cf04ba Merge pull request #14266 from owncloud/encodeUriComponentPerDefault
Encode parameters in `OC.generateUrl` by itself
2015-02-17 10:37:06 -05:00
Lukas Reschke 0ea6de2f8c Encode Requesttoken for avatars
Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged.

Shocking to see how much places in our code do it wrong 🔫
2015-02-17 15:25:38 +01:00
Robin Appelman e672f8cc8f Use appmanager in OC_App::enable/disable 2015-02-17 15:05:29 +01:00
Robin Appelman 5394a81c05 Dont fatal error test when encryption is enabled 2015-02-17 15:05:29 +01:00
Robin Appelman 04628cf368 better name for getAppsEnabledForUser 2015-02-17 15:05:29 +01:00
Robin Appelman 434835b326 also set user in UserSession when doing OC_User::setUserId 2015-02-17 15:05:29 +01:00
Robin Appelman 4d805b52cc Test improvements 2015-02-17 15:05:29 +01:00
Robin Appelman 409453bc60 better user group caching 2015-02-17 15:05:29 +01:00