Bjoern Schiessle
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
Jenkins for ownCloud
63726ea9e2
[tx-robot] updated from transifex
2014-09-29 01:54:33 -04:00
Jenkins for ownCloud
84923475c0
[tx-robot] updated from transifex
2014-09-28 01:55:09 -04:00
Jenkins for ownCloud
3a16b1bb68
[tx-robot] updated from transifex
2014-09-27 01:54:48 -04:00
Bjoern Schiessle
2a4da7fe09
on unshare only unshare childrens if there is no other parent available
2014-09-26 16:58:47 +02:00
Lukas Reschke
53f6d74938
Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master
...
catch and log exception in OC_Helper::cleanTmp()
2014-09-26 14:31:31 +02:00
Bjoern Schiessle
e115a7043f
only create a new share entry, if the user needs a different target name than the group share
2014-09-26 13:19:15 +02:00
Bjoern Schiessle
ed85055d31
for group shares we don't need a extra db entry of groupTarget equals itemTarget
2014-09-26 13:10:31 +02:00
Bjoern Schiessle
d242e518f9
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
2014-09-26 13:01:54 +02:00
Thomas Müller
4c08215e66
catch and log exception in OC_Helper::cleanTmp()
2014-09-26 11:36:53 +02:00
Thomas Müller
e5a111b80e
Merge pull request #11285 from owncloud/dav-permissions-create
...
Fix dav permissions for folders
2014-09-26 09:21:32 +02:00
Jenkins for ownCloud
1631937990
[tx-robot] updated from transifex
2014-09-26 01:54:59 -04:00
Robin Appelman
6365c57b04
Merge pull request #11282 from owncloud/scanner-memory-stable7
...
Don't keep the full info of all children in memory
2014-09-25 15:53:33 +02:00
Vincent Petry
9fc23e1967
Merge pull request #10934 from owncloud/datadir-write-setup
...
Don't complain about non-writable datadirs before we're installed
2014-09-25 14:32:32 +02:00
Bjoern Schiessle
52b6469b0c
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
2014-09-25 14:26:31 +02:00
Robin Appelman
10c350b895
Fix dav permissions for folders without create permissions
2014-09-25 14:01:19 +02:00
Robin Appelman
ccb4475a8d
Expose creatable permissions trough fileinfo
2014-09-25 14:00:13 +02:00
Bjoern Schiessle
968152113e
always select permissions, used in getItems()
2014-09-25 12:35:11 +02:00
Bjoern Schiessle
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
Jenkins for ownCloud
f46e49529f
[tx-robot] updated from transifex
2014-09-25 01:55:32 -04:00
Lukas Reschke
cb002c1f6b
Clarify possible preview providers for type Office
...
a
2014-09-24 21:21:39 +02:00
Thomas Müller
17f97ea2ca
Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON
...
Show login again instead of JSON if CSRF check fails
2014-09-24 17:51:12 +02:00
Robin Appelman
f88021dbbc
Don't keep the full info of all children in memory
2014-09-24 15:44:56 +02:00
Lukas Reschke
3da6b3b533
Merge pull request #11229 from kofemann/for-upstream
...
user/backed: use pow of two for backed action constants
2014-09-24 15:19:11 +02:00
Bjoern Schiessle
07d43df713
only add a new row if it isn't a unique share, otherwise update the existing row
2014-09-24 14:02:02 +02:00
Bjoern Schiessle
a6cc810349
mark exclude list as deprecated. It neither used by the files app nor by the
...
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
2014-09-24 14:02:02 +02:00
Bjoern Schiessle
9f7b15582a
fix add user to group to work with grouped shares
2014-09-24 14:02:01 +02:00
Bjoern Schiessle
bd268c35f5
generateTarget() will always find a unique target
2014-09-24 14:02:01 +02:00
Jenkins for ownCloud
5ff5b7386f
[tx-robot] updated from transifex
2014-09-24 01:56:46 -04:00
Lukas Reschke
75e45ac786
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
...
Do not show exception to the end-user - use a proper error page instead
2014-09-23 18:36:40 +02:00
Vincent Petry
89e02e89d4
Merge pull request #7051 from owncloud/postsetupajaxcheck
...
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
Tigran Mkrtchyan
276f50a1ba
user/backed: use pow of two for backed action constants
...
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.
The old values are preserved for backward compatibility.
2014-09-23 15:18:01 +02:00
Lukas Reschke
4893d2c0ed
Show login again instead of JSON if CSRF check fails
...
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.
With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.
This can be tested by opening the login page, then clearing the cookies, and trying to login.
2014-09-23 14:55:08 +02:00
Thomas Müller
c587a4aaa2
Merge pull request #11222 from owncloud/store-users-timezone-master
...
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
Thomas Müller
42fe0b9e08
Merge pull request #11241 from owncloud/use-lower-case
...
Use only lower-case letters
2014-09-23 12:16:58 +02:00
Lukas Reschke
5d977f97b0
Merge pull request #11032 from owncloud/harden-redirect
...
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Vincent Petry
e65ceb08fc
Moved WebDAV and internet checks to client side JS
...
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
server
2014-09-23 11:16:14 +02:00
Vincent Petry
fc42a64e6c
Merge pull request #11226 from owncloud/kill-postsetupcheck-master
...
remove post setup check
2014-09-23 10:33:50 +02:00
Jenkins for ownCloud
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
Thomas Müller
37a5bff155
Merge pull request #11227 from owncloud/fix-windows-path
...
fixing directory seperators
2014-09-23 07:38:23 +02:00
Morris Jobke
f970c81b1e
Merge pull request #11215 from owncloud/dav-throwwhendeletefailed
...
WebDAV now throws 403 when deletion did not work
2014-09-23 00:49:30 +02:00
Morris Jobke
051ed93e24
Merge pull request #11211 from owncloud/previewProviderSwitch
...
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
Lukas Reschke
1565d82b81
Use only lower-case letters
...
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
Lukas Reschke
6eeb905871
Do only follow HTTP and HTTPS redirects
...
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)
Get final redirect manually using get_headers()
Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Thomas Müller
21412559df
remove post setup check
2014-09-22 19:43:55 +02:00
Bjoern Schiessle
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
Morris Jobke
9e8d2907e2
Merge pull request #11204 from owncloud/fix_oc_stream_seek
...
Fix oc stream seek
2014-09-22 16:25:07 +02:00
Clark Tomlinson
db72270acc
fixing directory seperators
2014-09-22 10:13:46 -04:00
Lukas Reschke
ca3447fcde
Add a configuration switch for enabled preview mimetypes
2014-09-22 16:09:08 +02:00
Thomas Müller
814114ab8e
enhance formatDate function to accept an optional argument containing the time zone
2014-09-22 15:03:28 +02:00
Morris Jobke
831d34f084
Merge pull request #11210 from owncloud/issue/11209
...
Also match routes without trailing slash for files app
2014-09-22 14:04:20 +02:00
Thomas Müller
bb18fe1384
send browsers timezone back tp the server on login
2014-09-22 14:01:45 +02:00
Vincent Petry
470c25eff4
WebDAV now throws 403 when deletion did not work
...
Assume a permission issue whenever a file could not be deleted.
This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.
2014-09-22 13:15:17 +02:00
blizzz
b8a1340538
Merge pull request #9225 from voxsim/fix_displayNamesInGroup
...
fix in displayNamesInGroup
2014-09-22 12:13:15 +02:00
Jörn Friedrich Dreyer
f83689e1be
in quota wrapper use === instead of ! for better readability and as in other wrappers
2014-09-22 11:35:42 +02:00
Jörn Friedrich Dreyer
561a7e47cd
return boolean in Ciose::stream_seek
2014-09-22 11:33:55 +02:00
Joas Schilling
71bec60b92
Also match routes without trailing slash
...
Fix #11209
2014-09-22 11:22:33 +02:00
Jörn Friedrich Dreyer
b752cb98d8
return boolean in OC::stream_seek
2014-09-22 11:20:15 +02:00
Thomas Müller
b1d0a0f3bf
Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
...
Append port to trusted domain in case it's not 80 or 443
2014-09-22 10:04:02 +02:00
Thomas Müller
8abf786af9
Merge pull request #10499 from owncloud/mkcol-headers-afterbind
...
Use afterBind to send fileId header for files and directories
2014-09-22 10:02:03 +02:00
Jenkins for ownCloud
5aaf8dcc01
[tx-robot] updated from transifex
2014-09-22 01:54:36 -04:00
Morris Jobke
154e848ce2
Merge pull request #11199 from owncloud/delete_bogus_previews
...
Delete bogus cached previews while updating
2014-09-21 22:48:21 +02:00
Georg Ehrke
071e4bfc06
make sure preview prop is instanceof OC_Image before using it in showPreview
2014-09-21 17:30:29 +02:00
Georg Ehrke
ab2554e013
delete old previews
2014-09-21 17:16:21 +02:00
Morris Jobke
69726d951e
Merge pull request #11196 from owncloud/sqlite-migration-smallint-master
...
adding 'smallint unsigned' to type mapping for sqlite
2014-09-21 11:13:58 +02:00
Jenkins for ownCloud
a1c39f74b7
[tx-robot] updated from transifex
2014-09-21 01:54:29 -04:00
Thomas Müller
7537d405e3
adding 'smallint unsigned' to type mapping for sqlite
2014-09-20 20:06:44 +02:00
Jenkins for ownCloud
e55c4bb807
[tx-robot] updated from transifex
2014-09-20 01:54:34 -04:00
Morris Jobke
463dd44d6d
Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor
...
Throw error in showPreview instead the constructor
2014-09-19 21:39:30 +02:00
Lukas Reschke
4c6bad7f71
Merge pull request #11158 from owncloud/fix_basic_auth
...
Move BasicAuth check to isLoggedIn
2014-09-19 13:39:13 +02:00
Lukas Reschke
6869d2e82a
Throw error in showPreview instead the constructor
...
This function is also used in a way such as:
```
$preview = new \OC\Preview(\OC_User::getUser(), 'files');
$info = \OC\Files\Filesystem::getFileInfo($file);
if (!$always and !$preview->isAvailable($info)) {
\OC_Response::setStatus(404);
} else {
$preview->setFile($file);
$preview->setMaxX($maxX);
$preview->setMaxY($maxY);
$preview->setScalingUp($scalingUp);
$preview->setKeepAspect($keepAspect);
}
```
Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.
2014-09-19 13:26:41 +02:00
Vincent Petry
437f8c3cd5
Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
...
Remove old upgrade routines
2014-09-19 12:23:42 +02:00
Vincent Petry
f0186d99d2
Merge pull request #11163 from owncloud/check-for-updates-between-major-versions
...
Prevent updates between multiple major versions
2014-09-19 12:20:22 +02:00
Robin Appelman
33f7af9207
Merge pull request #10958 from owncloud/db-ilike
...
Introduce cross-db ILIKE
2014-09-19 12:07:56 +02:00
Jenkins for ownCloud
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
Lukas Reschke
a71af58535
Prevent updates between multiple major versions
...
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
voxsim
7a14f94ae5
1. remove sizeof($filteredUsers) > 0 as condition
...
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;
2014-09-18 17:50:19 +02:00
Lukas Reschke
d0d3b7457b
Move BasicAuth check to "isLoggedIn()"
...
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
2014-09-18 16:14:07 +02:00
Lukas Reschke
a543807d85
Merge pull request #11151 from owncloud/removeOverflowingFunction
...
Remove unused and overflowing function
2014-09-18 15:42:36 +02:00
Robin Appelman
a85f0ae2da
Fix ILIKE without wildcards for oracle
2014-09-18 15:09:57 +02:00
Lukas Reschke
f0bf46b080
Merge pull request #11130 from owncloud/moveBasicAuthCheck
...
Move basic auth check
2014-09-18 14:40:42 +02:00
Robin Appelman
c8dbdc29d0
Check for writable datadir during setup
2014-09-18 14:15:52 +02:00
Robin Appelman
23dd7cb51d
Don't complain about non-writable datadirs before we're installed
2014-09-18 13:33:13 +02:00
Robin Appelman
6fa3280c2a
Inject config into checkserver and cleanup tests
2014-09-18 13:33:13 +02:00
Lukas Reschke
d07d5915c9
Remove unused and overflowing function
...
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
Morris Jobke
c89c6ed21d
Merge pull request #11143 from owncloud/improve-404
...
Make 404 page easier to understand
2014-09-18 09:10:16 +02:00
Jenkins for ownCloud
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
Lukas Reschke
8fc1a9f5a9
Make 404 page easier to understand
...
Fixes https://github.com/owncloud/core/issues/11133
2014-09-17 22:57:32 +02:00
Remco Brenninkmeijer
f930b356e6
Error needs to push body-id for new guest layout
2014-09-17 18:02:18 +02:00
Lukas Reschke
ef0a0f5f87
Merge pull request #9554 from owncloud/fix_preview_orientation
...
fix orientation in image-backend, not in preview system itself
2014-09-17 17:05:47 +02:00
Robin Appelman
0c03b2bdd5
Use ILIKE in cache search
2014-09-17 16:12:54 +02:00
Lukas Reschke
c19bc1917b
Move basic auth check
...
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.
Fixes https://github.com/owncloud/core/issues/11129
2014-09-17 16:04:12 +02:00
Lukas Reschke
c88d517e88
Merge pull request #10622 from owncloud/recursive-delete-forbidden
...
Fix isDeletable
2014-09-17 15:36:41 +02:00
Robin Appelman
67b1ec1faf
Implement ILIKE for sqlite
2014-09-17 13:47:55 +02:00
Robin Appelman
60587e9dcd
Make sqlite LIKE case sensitive on default
2014-09-17 13:47:33 +02:00
Morris Jobke
c6eab9aaba
fix error message template
2014-09-17 13:25:50 +02:00
Lukas Reschke
6d3757f864
Do not show exception to the end-user
...
Log the error instead of potentially leaking sensitive information
2014-09-17 13:17:52 +02:00
Morris Jobke
b644e8a5e7
Merge pull request #10932 from owncloud/issue/10926
...
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
Lukas Reschke
33c0d2f743
Fix mapping of relative paths
2014-09-17 11:38:10 +02:00
Robin Appelman
2f22e67570
Also check if the file itself is updatable
2014-09-17 11:35:16 +02:00
Robin Appelman
d25a9a118f
Check if a folder is deletable before we try to recursively delete it
2014-09-17 11:35:16 +02:00
Robin Appelman
ab79caf29b
Check if the parent is writable to check if a file is deletable
2014-09-17 11:35:16 +02:00
Lukas Reschke
0d37e16499
Merge pull request #11092 from owncloud/conceal_sabredav_version
...
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +02:00
Lukas Reschke
2cfa07049f
Remove old upgrade routines
...
We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.
2014-09-16 20:27:52 +02:00
Lukas Reschke
368391e401
Merge pull request #11009 from owncloud/tobiasKaminsky-route
...
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke
4ebc11aa8d
Merge pull request #11102 from owncloud/visit1985-issue_108
...
mysql setup: if dbuser exists try a different one (owncloud/core#108 )
2014-09-16 18:54:37 +02:00
Lukas Reschke
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Thomas Müller
ba445e85b2
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
...
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
Lukas Reschke
2f10b60c9e
Merge pull request #10754 from cetra3/master
...
Refactor internal session handler to write directly to $_SESSION
2014-09-16 15:48:19 +02:00
Thomas Müller
ca35d86c5a
adding ILIKE to AdapterSQLSrv
2014-09-16 15:44:21 +02:00
Robin Appelman
1771bfc2f2
Introduce cross-db ILIKE
2014-09-16 15:32:34 +02:00
tobiasKaminsky
e62d5b7e55
Route for thumbnail generation
...
Thumbnail generation
Removed Log
Added requested changes
Added requested changes.
- Fix code style
- Add exception if file does not exist
- Switch route styling
Replaces https://github.com/owncloud/core/pull/10805
Fix codestyle
Fix codestyle
Migrate to appframework
Fix typo
2014-09-16 15:00:58 +02:00
Lukas Reschke
261d07c95c
Merge pull request #11084 from owncloud/no-migration-for-mssql-master
...
Disable database migrations for MSSQL - scripts have to be applied manua...
2014-09-16 14:00:24 +02:00
scolebrook
f31e4066de
Conceal or display SabreDAV version number in browser and http response headers.
2014-09-16 13:25:44 +02:00
Lukas Reschke
5813cf32dc
Deduplicate dependency checks
...
Some code that I also used for https://github.com/owncloud/administration/pull/11
2014-09-16 13:07:47 +02:00
Michael Göhler
e6609d0970
simplify mysql user creation flow
...
if dbuser exists try a different one, owncloud/core#108
changed outdated comment
corrected length calculation
changed indentation for else clauses
2014-09-16 11:53:54 +02:00
Morris Jobke
dd70d1b88c
Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
...
Fix unexisting class and PHPDoc
2014-09-16 10:29:01 +02:00
Morris Jobke
af52ffc5d5
Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
...
add y to with-aspect naming schema
2014-09-16 08:36:33 +02:00
Morris Jobke
245a0e2ad8
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
...
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
voxsim
1366133d2b
add more logic in displayNamesInGroup for big user bases
2014-09-15 18:37:54 +02:00
Lukas Reschke
627252fe81
Merge pull request #11060 from owncloud/rmobslang
...
remove obsolete language files
2014-09-15 17:31:10 +02:00
Lukas Reschke
4f0f7e35ca
Fix unexisting class and PHPDoc
...
You can't add int here as hint...
2014-09-15 17:08:56 +02:00
Morris Jobke
06eb3b62c6
Merge pull request #10109 from owncloud/issue_#9793_guestlayout
...
Step one, open guest layout for different styles.
2014-09-15 15:15:41 +02:00
Georg Ehrke
cf76933b76
add phpdoc
2014-09-15 15:10:03 +02:00
Georg Ehrke
3157d307f7
add y to with-aspect naming schema
2014-09-15 15:10:03 +02:00
Thomas Müller
d824d03fe1
Disable database migrations for MSSQL - scripts have to be applied manually
2014-09-15 15:00:32 +02:00
Lukas Reschke
07b14bcd4f
Merge pull request #10960 from owncloud/use-intl-module-master
...
use intl's native normalizer_normalize() in case the module is available
2014-09-15 14:13:30 +02:00
Volkan Gezer
5d1fa60e0d
remove obsolete language files
2014-09-13 15:29:11 +02:00
Raghu Nayyar
1145529584
Merge pull request #11041 from owncloud/no-size-check-on-lock-master
...
content size checks are not valid for LOCK
2014-09-13 00:48:52 +05:30
Clark Tomlinson
cfd8b3f976
Merge pull request #11043 from owncloud/test-againstNull
...
Return false in case the passed values are not of type string
2014-09-12 09:42:42 -04:00
Lukas Reschke
5ff999d69d
Return false in case one of the values is null
2014-09-12 13:34:45 +02:00
Thomas Müller
27cd30aa94
content size checks are not valid for LOCK
2014-09-12 09:42:32 +02:00
Jenkins for ownCloud
d6834b6389
[tx-robot] updated from transifex
2014-09-12 03:28:56 -04:00
Thomas Müller
4878f7a416
Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
...
Add custom hex2bin implementation for 5.3
2014-09-11 15:05:36 +02:00
Lukas Reschke
7d2c521b46
Step one, open guest layout for different styles.
...
Conflicts:
core/templates/layout.guest.php
Step one, open guest layout for different styles.
2014-09-11 11:41:02 +02:00
Lukas Reschke
8d7926543b
Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over
...
Refresh if maintenance mode is over
2014-09-11 11:34:39 +02:00
Thomas Müller
59209e0f2b
use intl's native normalizer_normalize() in case the module is available
2014-09-11 10:24:31 +02:00
Lukas Reschke
bfebbe47de
Merge pull request #10962 from owncloud/repair_search_lucene
...
repair search lucene before installing
2014-09-11 10:09:43 +02:00
Lukas Reschke
1973275adc
Add custom hex2bin implementation for 5.3
...
Fixes https://github.com/owncloud/core/issues/11004
2014-09-11 09:51:45 +02:00
Jenkins for ownCloud
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
kondou
18ef7bf1ed
Preserve transparency when loading from a file
...
Fix #7148 - again :)
2014-09-10 23:49:21 +02:00
Thomas Müller
2a382a87d5
Merge pull request #10988 from owncloud/usetransactions-wrong-name
...
Fix method name useTransactions
2014-09-10 17:27:23 +02:00
Robin Appelman
fa2b385d33
Fix method name
2014-09-10 15:59:24 +02:00
Vincent Petry
70ebe86e60
Merge pull request #10929 from owncloud/issue/10514
...
Set overwritewebroot when installing owncloud to avoid problems
2014-09-10 15:07:57 +02:00
Jörn Friedrich Dreyer
8e2acb1482
repair search lucene before installing
2014-09-10 10:22:40 +02:00
Bernhard Posselt
ba698a4942
Merge pull request #10972 from ppaysant/routes-defaults
...
Allow default values for route parameters.
2014-09-09 23:40:46 +02:00
Lukas Reschke
c3d90b96c8
Merge pull request #10922 from owncloud/explicit-scan-transactions
...
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Patrick Paysant
cb5416b798
Allow default values for route parameters.
2014-09-09 23:00:29 +02:00
kondou
69f2c0544e
Refresh if maintenance mode is over
...
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.
Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
Bernhard Posselt
023e066971
more sugar for including lists of templates
2014-09-09 15:47:42 +02:00
Bernhard Posselt
d02f6c7ebe
Merge pull request #10947 from owncloud/html-imports
...
add template functions for html imports
2014-09-09 14:07:46 +02:00
Jörn Friedrich Dreyer
3d4f77c8f1
Merge pull request #10949 from owncloud/allow_prefilling_login
...
allow prefilling login
2014-09-09 11:42:14 +02:00
Lukas Reschke
353155b516
Merge pull request #7323 from owncloud/Jonny007-MKD-master
...
Update adapter.php
2014-09-09 11:31:50 +02:00
Jörn Friedrich Dreyer
ed2414fd0d
Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
...
Keep fileid on move in objectstore, fixes #10848
2014-09-09 10:25:10 +02:00
Jenkins for ownCloud
317e6d03b4
[tx-robot] updated from transifex
2014-09-09 01:55:47 -04:00
VicDeo
efd485acda
Merge pull request #10858 from owncloud/issue/10847
...
Use correct language package so the subject is correctly translated
2014-09-09 01:11:34 +03:00
Vincent Petry
a9a3f17b35
Merge pull request #10927 from owncloud/update-nosetupbackends
...
Do not load extra user backends when an upgrade is due
2014-09-08 22:57:15 +02:00
Jörn Friedrich Dreyer
0aad7fa1b1
allow prefilling login
2014-09-08 21:44:13 +02:00
Bernhard Posselt
f685d03674
append .html since componets always use html files
2014-09-08 21:37:18 +02:00
Bernhard Posselt
4aff85cd0c
add template functions for html imports
2014-09-08 21:19:44 +02:00
Lukas Reschke
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Lukas Reschke
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke
2d847934ed
Merge pull request #10938 from owncloud/useSecureMimetype
...
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
Lukas Reschke
5de404eb92
Merge pull request #10827 from oparoz/patch-2
...
Libreoffice config folder needs to be set
2014-09-08 16:41:26 +02:00
Lukas Reschke
fa718d2e2c
Fix typo
2014-09-08 16:34:03 +02:00
Lukas Reschke
0cdfe4f8c2
Merge pull request #10911 from owncloud/template-funcs
...
Add template shortcut functions for style and script
2014-09-08 16:32:05 +02:00
Lukas Reschke
2590a4dc85
Append port to trusted domain in case it's not 80 or 443
...
Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059
2014-09-08 16:15:31 +02:00
Lukas Reschke
312ed18d15
Use secure mimetype for content delivery
...
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
Joas Schilling
c5b5378558
Add a method to get the absolute url for a route
...
Fix #10926
2014-09-08 14:43:14 +02:00
Joas Schilling
249558966e
Set overwritewebroot when installing owncloud to avoid problems
...
Fix #10514
2014-09-08 14:30:13 +02:00
Robin Appelman
644755df66
Use bigger transactions when doing explicit file system scans
2014-09-08 14:15:41 +02:00
Vincent Petry
d6bfd90bf8
Do not load extra user backends when an upgrade is due
...
Whenever an upgrade is due, do not load extra user backends
2014-09-08 12:30:04 +02:00
Vincent Petry
637cff68ac
Merge pull request #10862 from chli1/master
...
fix BadRequest error if CONTENT_LENGTH not set
2014-09-08 10:00:15 +02:00
cetra3
459ead69f6
Merge branch 'master' of https://github.com/owncloud/core
2014-09-08 15:05:49 +09:30
Bernhard Posselt
7e4d244200
add shortcut functions for style and script
2014-09-06 14:25:28 +02:00
Lukas Reschke
f5951b2254
Merge pull request #10889 from owncloud/moveTrustedDomainCheck
...
Move trusted domain check to init()
2014-09-05 17:39:37 +02:00
Lukas Reschke
c9afa60f62
Move trusted domain check to init()
...
handleRequest() is not called from remote.php or public.php which made these files party available but all included apps in there produced errors.
As the expected behaviour is anyways that a trusted domain warning is shown I moved this to init()
Fixes https://github.com/owncloud/core/issues/10064
2014-09-05 14:10:35 +02:00
Jörn Friedrich Dreyer
8488be4d03
Keep fileid on move in objectstore, fixes #10848
2014-09-05 13:25:59 +02:00
Robin Appelman
e29b7e9335
Remove explicit propagate calls
2014-09-05 11:53:24 +02:00
Robin Appelman
d0e83a71aa
Update cache before post hooks
2014-09-05 11:53:24 +02:00
Robin Appelman
1d8a88dd1b
Fix warning in homecache
2014-09-05 11:53:23 +02:00
Robin Appelman
850542c5d6
Refactor Cache\Updater to work outside of the users home
2014-09-05 11:53:23 +02:00
Jenkins for ownCloud
0736a6695e
[tx-robot] updated from transifex
2014-09-05 01:54:39 -04:00
kondou
ecc9b42e41
Match \OC_Helper::linkToPublic() to new links and fit unittests
2014-09-04 20:44:50 +02:00
kondou
a10411d2bc
Readd TOKEN_LENGTH
2014-09-04 19:09:26 +02:00
Jesus Macias Portela
523680cef2
Merge pull request #10840 from owncloud/issue_10674
...
Solve bug with touch always return true on /lib/private/files/view.php
2014-09-04 17:29:08 +02:00
kondou
226b203e20
Use base62 and remove configuration options for link length
2014-09-04 16:20:20 +02:00
kondou
c2d8eabd71
Change config.sample entry and use MediumSecurity
2014-09-04 15:52:23 +02:00
kondou
3bf725d7e0
Adapt token size to new generation and add an option for free length specification
...
Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.
2014-09-04 15:24:33 +02:00
kondou
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
kondou
0f2ad9862e
Initial work on shorter links
2014-09-04 15:23:53 +02:00
Lukas Reschke
1a7df33233
Merge pull request #10818 from owncloud/enableappforgroupfix
...
Fix upgrade process when apps enabled for specific groups
2014-09-04 13:56:41 +02:00
chli1
712487c861
fix BadRequest error if CONTENT_LENGTH not set
...
If client does not send content length header on webdav upload (e.g. because the content comes from a stream and its length is not predictable) the put() method should not try to compare the content length value with the actually amount of received data, because this will always fail and results in a BadRequest exception. So the check will only be performed if $_SERVER['CONTENT_LENGTH'] is set.
2014-09-04 13:49:15 +02:00
Robin Appelman
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
Robin Appelman
8605e2e6a5
Explicitly cast id and validate type
2014-09-04 13:26:47 +02:00
Olivier Paroz
bbc2d7cf4f
Typ in whichOpenOffice test
2014-09-04 12:54:20 +02:00
Joas Schilling
a0e8e88bc6
Use correct language package so the subject is correctly translated
...
Fix #10847
2014-09-04 11:23:23 +02:00
Lukas Reschke
8fec19a872
Merge pull request #10790 from cbhp/master
...
added missing User-Agents
2014-09-03 22:40:12 +02:00
Jesus Macias
91c8174013
Fix code with previous comments
2014-09-03 18:21:24 +02:00
Jesus Macias
883649b69c
Reset changes on 3rdparty submodule
2014-09-03 18:20:09 +02:00
cbhp
c00450b2c7
always use a user-agent constant
...
Some providers block connections with missing user-agents. Also
user-agents are useful for analyzing requests. I've added a USER_AGENT
constant that is used in cURL and in file_get_contents.
2014-09-03 18:00:05 +02:00
Lukas Reschke
63a90a129b
Use proper RNG generator
...
OC_Util::generateRandomBytes() only returns lowercase alphanumeric values.
We should use the new RNG which has a broader characterset.
2014-09-03 17:46:48 +02:00
Lukas Reschke
26f337d523
Only return lowercase letters and digits for backwards compatbility
2014-09-03 17:18:00 +02:00
Thomas Müller
954925eaa0
Merge pull request #10667 from pmjdebruijn/itunes-appid
...
defaults: add customizable defaultiTunesAppId
2014-09-03 16:26:20 +02:00
Olivier Paroz
eaab067716
env:UserInstallation was already there in master
...
My changes were made against stable7 and I merged them to the file in master, so this version is now the properly merged file for master.
I'm just adding `owncloud-<instanceid>` to the path where temp files are stored.
2014-09-03 16:08:40 +02:00
Lukas Reschke
373d1c5e9f
Merge pull request #10642 from owncloud/securityutils
...
Add some security utilities
2014-09-03 15:28:42 +02:00
Clark Tomlinson
d64cacec43
Merge pull request #10826 from oparoz/master
...
Adding TIFF support to the files app
2014-09-03 09:14:35 -04:00
Clark Tomlinson
0400f7845c
Merge pull request #10723 from owncloud/webdav-folder-size
...
adding new webdav property containing the folder size
2014-09-03 09:07:23 -04:00
Lukas Reschke
dcea6de26a
Fix quoting
2014-09-03 14:16:55 +02:00
Lukas Reschke
a54af89d8a
Add test for the second argument
2014-09-03 14:13:12 +02:00
Robin Appelman
65608d7c92
Use the public api to get event sources
2014-09-03 13:36:15 +02:00
Robin Appelman
dad53180bc
Add event source to the public api
2014-09-03 13:36:15 +02:00
Robin Appelman
54c918fe48
Initialize an event source when we start using it, not in the constructor
2014-09-03 13:35:04 +02:00
Olivier Paroz
3bf155e138
This is not a PDF, there are no pages
2014-09-03 12:32:59 +02:00
Lukas Reschke
20a7fb0334
Fix CHAR_SYMBOLS
2014-09-03 12:22:21 +02:00
Thomas Müller
6cdb1d89ae
Merge pull request #10761 from canadaduane/fix_occ_upgrade
...
Ensure db connection before changing cache state
2014-09-03 11:27:16 +02:00
Thomas Müller
52dc31e13c
Merge pull request #10725 from owncloud/sabredav-etag-master
...
adding OC-ETag header
2014-09-03 11:21:47 +02:00
Lukas Reschke
77c0adb520
Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils
2014-09-03 11:04:49 +02:00
Lukas Reschke
50b430ee7c
Add char consts, hash the specified password for the HMAC
2014-09-03 11:03:27 +02:00
Jenkins for ownCloud
8787162ec9
[tx-robot] updated from transifex
2014-09-03 01:54:34 -04:00
Olivier Paroz
0c3c72aec0
Libreoffice config folder needs to be set
...
In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance.
Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353 ), I propose to use /tmp/owncloud-instanceid
2014-09-03 03:12:35 +02:00
Olivier Paroz
b559b21dc3
Converts TIFF files to PNG
2014-09-02 22:56:39 +02:00
Olivier Paroz
1e600a0d36
Adding support for tiff files
2014-09-02 22:53:41 +02:00
Vincent Petry
e05b95636b
Fix upgrade process when apps enabled for specific groups
...
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
2014-09-02 17:16:14 +02:00
Robin Appelman
3c618a0252
Also setup the filesystem when matching routes
2014-09-02 16:15:42 +02:00
Robin Appelman
a9a37b5363
Don't automatically setup the filesystem the moment we load OC\Files\FileSystem
2014-09-02 16:15:42 +02:00
Jenkins for ownCloud
689bbbe937
[tx-robot] updated from transifex
2014-09-02 01:56:07 -04:00
Jenkins for ownCloud
e6e04bde4f
[tx-robot] updated from transifex
2014-09-01 01:59:19 -04:00
cbhp
969b41c1c9
added missing User-Agents
...
header "User-Agent" was missed
2014-08-31 19:44:06 +02:00
Morris Jobke
4024960a0e
Merge pull request #10780 from owncloud/config-public
...
Extend public config interface
2014-08-31 15:54:35 +02:00
Lukas Reschke
8009df0b60
Merge pull request #10420 from owncloud/external-share-self-signed
...
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman
0a1e5aebf1
Extend public config interface
2014-08-31 15:27:36 +02:00
Lukas Reschke
ae3425d2da
Merge branch 'master' into securityutils
...
Conflicts:
lib/private/util.php
2014-08-31 15:21:09 +02:00
Morris Jobke
73685892ed
Merge pull request #10770 from owncloud/getUserFolder
...
update public interface for getUserFolder
2014-08-31 13:26:32 +02:00
Lukas Reschke
a197ef0f6c
Merge pull request #10768 from owncloud/l10n-use-public
...
Use public api for getting l10n
2014-08-31 11:58:59 +02:00
Morris Jobke
ac6324a5d0
update public interface for getUserFolder
2014-08-31 11:16:40 +02:00
Robin Appelman
bfa0c4b78a
Explicitly set the timezones
2014-08-31 11:06:18 +02:00
Lukas Reschke
4efe6f6240
Add unit tests and fix rootcerts creation bug
2014-08-31 10:47:50 +02:00
Robin Appelman
e64aa330fd
check for blacklisted file certificate filenames
2014-08-31 10:47:50 +02:00
Robin Appelman
79d896e830
Rename namespace
2014-08-31 10:47:50 +02:00
Robin Appelman
6044ad0e17
Cleanup certificate code
2014-08-31 10:47:50 +02:00
Robin Appelman
ba8416a04f
move certificate classes to their own namespace
2014-08-31 10:47:50 +02:00
Robin Appelman
c158db7200
Add certificate class
2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea
Move certificate management interface from files_external to core
2014-08-31 10:47:50 +02:00
Robin Appelman
4efdbff6df
No need for this folder to be world accessible
2014-08-31 10:45:11 +02:00
Robin Appelman
dcc4f96d3e
Verify names of certificates
2014-08-31 10:45:11 +02:00
Robin Appelman
ecdbf00628
Move certificate management code to core
2014-08-31 10:45:10 +02:00
Robin Appelman
a58e670ae5
Also extend public server interface
2014-08-31 10:20:00 +02:00
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
Morris Jobke
06e6f10ce4
Add optional user ID parameter for getUseFolder
2014-08-31 09:49:19 +02:00
Jenkins for ownCloud
23137f4798
[tx-robot] updated from transifex
2014-08-31 01:56:20 -04:00
Duane Johnson
ccf440495e
Ensure db connection before changing cache state
...
When trying to upgrade from 7.0.0 to 7.0.2, the manual upgrade path
(e.g. ` sudo -u www-data /usr/bin/php5 ./occ upgrade`) exits with the
following fatal error:
```
/var/www/owncloud# php occ upgrade
PHP Fatal error: Call to a member function
disableQueryStatementCaching() on a non-object in
/var/www/owncloud/lib/private/db.php on line 423
```
This is caused by the self::$connection static variable having not
been initialized at the point of call. Adding a self::connect() fixes
the issue.
See https://forum.owncloud.org/viewtopic.php?f=29&t=23398&p=68556#p68556
2014-08-30 15:46:56 -06:00
cetra3
6b24aa5224
Refactor internal session to write directly to $_SESSION
2014-08-30 08:48:13 +00:00
Jenkins for ownCloud
53f3b7ab52
[tx-robot] updated from transifex
2014-08-30 01:57:04 -04:00
Robin Appelman
0b88355368
Merge pull request #10721 from owncloud/kill-rand
...
Kill insecure random number generation
2014-08-29 19:48:00 +02:00
Morris Jobke
3a4b71ffb4
Merge pull request #10734 from owncloud/fix-10268
...
retrieve local users, groups and group members in a sorted way
2014-08-29 19:35:32 +02:00
Lukas Reschke
35276def1c
Merge pull request #10614 from owncloud/remove-ee-hack
...
Remove different URL for EE
2014-08-29 18:23:15 +02:00
Jörn Friedrich Dreyer
10382ef2f0
allow empty hostname and dots in service name for oracle autosetup
2014-08-29 17:09:17 +02:00
Robin Appelman
3de69ff81b
Don't register the call when rendering error pages
2014-08-29 15:44:39 +02:00
Robin Appelman
dd7b8e4555
Remove insecure fallback random number generation
2014-08-29 15:44:09 +02:00
Arthur Schiwon
0bb460c9b5
retrieve local users, groups and group members in a sorted way
2014-08-29 15:17:37 +02:00
Thomas Müller
96a931929e
adding OC-ETag header
2014-08-29 12:09:33 +02:00
Thomas Müller
647120fb36
adding new webdav property containing the folder size
2014-08-29 11:39:02 +02:00
Jörn Friedrich Dreyer
f687794a4a
be correct in deprecation documentation
2014-08-29 10:22:21 +02:00
Jörn Friedrich Dreyer
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Jenkins for ownCloud
359590d576
[tx-robot] updated from transifex
2014-08-29 01:56:59 -04:00
voxsim
a49610e18a
change logic in displayNamesInGroup and add some unit tests
2014-08-28 13:51:48 +02:00
Arthur Schiwon
aeb9cfc6c9
make sure class file is loaded once
2014-08-28 12:34:29 +02:00
Lukas Reschke
2f76117cb8
Merge pull request #10670 from owncloud/encodeExceptions
...
Escape error messages
2014-08-28 09:36:18 +02:00
Jenkins for ownCloud
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
Lukas Reschke
9ab62ad5b7
Escape error messages
2014-08-27 17:01:51 +02:00
Clark Tomlinson
cb0da1178b
Merge pull request #10653 from owncloud/x-forwarded-for
...
Add support for getting the real client IP behind proxies
2014-08-27 10:32:34 -04:00
Pascal de Bruijn
49da0a7943
defaults: add customizable defaultiTunesAppId
2014-08-27 14:07:39 +02:00
Björn Schießle
c35d60f6d8
Merge pull request #9915 from suraia/unsharefromself-source
...
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
Jenkins for ownCloud
2740908a5b
[tx-robot] updated from transifex
2014-08-27 01:54:40 -04:00
Lukas Reschke
3329e0f2b2
Use DI
2014-08-27 00:49:53 +02:00
Lukas Reschke
d26a9c3c58
Add some security utilities
...
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions
Remove .htaccess
Remove .htaccess
Fix typo
Add public API
Use timing constant comparision
Remove CBC constant
Adjust code
Remove confusing $this
2014-08-27 00:18:04 +02:00
Lukas Reschke
7acdd018a1
Add support for getting the real client IP behind proxies
...
Fixes https://github.com/owncloud/core/issues/10624
Fix copy paste fail
Add unittest for comma separated headers
Revert 3rdparty
2014-08-27 00:05:04 +02:00
Clark Tomlinson
c0bc41ff1e
Merge pull request #10640 from owncloud/add_moment_js
...
add moment.js
2014-08-26 13:32:47 -04:00
Georg Ehrke
f82b788ba5
add moment.js
2014-08-26 17:39:15 +02:00
Thomas Müller
2e8026a7b5
Merge pull request #10619 from owncloud/issue/6722
...
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-26 10:33:18 +02:00
Lukas Reschke
ca7e4c8c67
Add isAppstoreEnabled instead of hijacking the URL
2014-08-26 10:20:51 +02:00
Jenkins for ownCloud
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
Clark Tomlinson
6523c575f3
Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries
...
Do not try to close the same resource multiple times
2014-08-25 12:52:06 -04:00
Vincent Petry
c86824fa09
Merge pull request #10023 from owncloud/tmp-file-created-status
...
Log unsuccessful temp file creation and return false
2014-08-25 17:24:46 +02:00
Joas Schilling
989da69cff
Do not try to close the same resource multiple times
2014-08-25 15:31:43 +02:00
Joas Schilling
1846aebfff
Use md5() of the original name instead of uniqid() for slugifying
...
Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.
If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.
Fix #6722
2014-08-25 15:06:12 +02:00
Joas Schilling
b861e1d696
Fix code layout before fixing the function
2014-08-25 15:06:10 +02:00
Jörn Friedrich Dreyer
ebf7758d10
Merge pull request #10595 from owncloud/swift-stream
...
Stream downloads from Swift object stores without downloading it first
2014-08-25 11:26:39 +02:00
Jenkins for ownCloud
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
Lukas Reschke
104d1eaed2
Merge pull request #10528 from owncloud/fix-htaccess-check-error
...
Fix htaccess check error
2014-08-24 20:40:06 +02:00
Lukas Reschke
4bc72cc4e0
Remove different URL for EE
...
This can now be achieved by setting `appstoreenabled` to `false` in config.php
2014-08-24 20:22:15 +02:00
Jenkins for ownCloud
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
Clark Tomlinson
2ad0d3f1be
Throw exception if file cannot be accessed via http
...
Format file
Removing calls to deprecated classes and using internal method to get via http
Missed a character
Fix inverted logic
2014-08-22 19:41:30 -04:00
Thomas Müller
a77d468d35
Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
...
Add a trusted domain wizard
2014-08-22 17:12:17 +02:00
Lukas Reschke
88c3a4a31a
Expose setSystemValue
2014-08-22 15:53:23 +02:00
Thomas Müller
0e8916b147
Merge pull request #7539 from owncloud/repair-legacystorageid
...
Added repair script to upgrade the legacy home storage ids
2014-08-22 14:22:39 +02:00
Robin Appelman
191a82e768
Stream downloads from Swift object stores without downloading it first
2014-08-22 14:11:36 +02:00
Thomas Müller
b8b2ef8748
no statement caching for Oracle
2014-08-22 12:06:36 +02:00
Jenkins for ownCloud
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df
Add a trusted domain wizard
...
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.
By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
blizzz
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Robin Appelman
63570df75f
Add files as string to tar archives
2014-08-21 08:49:57 +02:00
Robin Appelman
88c32861bc
reformat
2014-08-21 08:49:57 +02:00
Jenkins for ownCloud
952fac8493
[tx-robot] updated from transifex
2014-08-21 01:56:31 -04:00
Vincent Petry
8f201c7383
Explicily close the statement cursors
...
Fixes the issue that makes SQLite freeze on later tests.
2014-08-20 23:49:15 +02:00
Lukas Reschke
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Vincent Petry
068f9d10f1
Added repair step for legacy storages
2014-08-20 23:14:05 +02:00
Vincent Petry
36c88e2830
Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupported
...
Return whole file if range request cannot be granted due to encryption
2014-08-20 18:14:09 +02:00
Jenkins for ownCloud
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
Morris Jobke
ab6ee6a600
Add doc for \OCP\Files\FileInfo space constants
2014-08-19 16:49:51 +02:00
Morris Jobke
9a5e745a64
fix typo
2014-08-19 16:45:22 +02:00
Lukas Reschke
ea2a45f19d
Remove loadAppScriptFile
2014-08-19 15:16:49 +02:00
Morris Jobke
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
Stephan Peijnik
5d7deefd95
Use tabs for indentation.
...
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:43 +02:00
Stephan Peijnik
2df52e54d7
Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
...
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
Robin Appelman
fdfc5c67f8
Merge pull request #9866 from owncloud/app-upgrade
...
Don't do app upgrades in the background
2014-08-19 13:33:38 +02:00
Lukas Reschke
fdb203ff1e
Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinking
...
Add a copied_sample_config switch
2014-08-19 11:03:57 +02:00
Thomas Müller
1c23f54d42
Merge pull request #10341 from owncloud/issue/9928
...
[Issue/9928] Problems with filemtime in MappedLocal Storage
2014-08-19 10:10:09 +02:00
Lukas Reschke
c33d1cacd4
Add a copied_sample_config switch
...
Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports...
Add some explanation about this switch
Move check to init
2014-08-19 09:57:03 +02:00
Jenkins for ownCloud
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
Vincent Petry
ec274ad40b
Use afterBind to send fileId header for files and directories
...
afterBind is called for both files and directories and is now used to
send the OC-FileId headers.
2014-08-18 18:40:58 +02:00
helix84
722a119e46
fix typo in util.php
2014-08-18 15:59:36 +02:00
Robin Appelman
ab590ce9a0
fix undefined variable
2014-08-18 15:30:46 +02:00
Thomas Müller
62e06cb0ba
Merge pull request #10472 from owncloud/fix_undefined_index_ocsid
...
check if array index ocsid is set before accessing it
2014-08-18 10:43:21 +02:00
Thomas Müller
c933848c55
Merge pull request #10156 from owncloud/issue/9968
...
Check return of fopen() before using it
2014-08-18 10:35:04 +02:00
Jenkins for ownCloud
4dd07f572c
[tx-robot] updated from transifex
2014-08-18 01:56:30 -04:00
Frank Karlitschek
ddeb301ad6
Merge pull request #10456 from kroimon/skeleton_dir_config
...
Make skeleton directory configurable.
2014-08-17 20:01:02 -04:00
Thomas Müller
c08a1e6455
according to PHPDoc this function shall return the entity
2014-08-17 22:27:55 +02:00
Georg Ehrke
7347174636
check if array index ocsid is set before accessing it
2014-08-17 22:26:14 +02:00
Thomas Müller
4c79d34980
Merge pull request #10469 from owncloud/remove-xmailer-header
...
Remove X-Mailer header from mails
2014-08-17 21:46:11 +02:00
Lukas Reschke
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Lukas Reschke
a2677c14c8
Remove X-Mailer header from mails
2014-08-17 18:55:13 +02:00
Jenkins for ownCloud
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
Jenkins for ownCloud
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
Stefan Rado
ccc46be740
Make skeleton directory configurable.
2014-08-16 01:07:42 +02:00
Lukas Reschke
a822a31ce3
Merge pull request #10442 from owncloud/move-failed-logins
...
Move authentication failed logging to checkPassword
2014-08-15 16:50:28 +02:00
Clark Tomlinson
1fff77f5de
Merge pull request #10440 from owncloud/enforce-debug
...
Remove ability to trigger DEBUG mode via cookie
2014-08-15 09:03:29 -04:00
Lukas Reschke
98fc56831d
Merge pull request #9275 from NormalRa/master
...
Add .apk mimetype.
2014-08-15 14:41:53 +02:00
Lukas Reschke
a82cd1ff67
Fix unit test
2014-08-15 14:15:27 +02:00
Lukas Reschke
5bb4772858
Move authentication failed logging to checkPassword
...
Fixes https://github.com/owncloud/core/issues/10366
2014-08-15 12:13:00 +02:00
Lukas Reschke
a4a897d26d
Remove ability to trigger DEBUG mode via cookie
...
Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour.
We should backport this.
2014-08-15 11:21:56 +02:00
Jenkins for ownCloud
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
Jörn Friedrich Dreyer
799fb46927
add missing @deprecated annotation to legacy classes
2014-08-14 22:18:12 +02:00
Thomas Müller
c1102b1671
Merge pull request #10417 from owncloud/update_deprecation_doc
...
update deprecation docs
2014-08-14 17:54:23 +02:00
Björn Schießle
64c3fe670c
Merge pull request #10399 from owncloud/fix_setSendMailStatus
...
[sharing] fix mail notification
2014-08-14 17:45:39 +02:00
Joas Schilling
4d32e3548b
Ensure that filename is prefixed with a slash
2014-08-14 16:48:30 +02:00
Clark Tomlinson
4502eaf9f8
Merge pull request #10414 from owncloud/relax-code-checker
...
in order to prevent false-positives on the code checker - exec and eval ...
2014-08-14 09:35:20 -04:00
Vincent Petry
cc8c1d8e07
Return whole file if range request cannot be granted due to encryption
...
Whenenver range headers are set and encryption is enabled, it is not
possible to automatically fseek() to the proper position.
To avoid returning corrupt/invalid data or causing a decryption error,
the range headers are stripped so that the SabreDAV code in httpGet()
returns the whole file.
2014-08-14 15:18:49 +02:00
Jörn Friedrich Dreyer
fd798fd982
update deprecation docs
2014-08-14 12:22:34 +02:00
Morris Jobke
987a0565fb
Merge pull request #10395 from owncloud/close-filehandle-lib-files
...
Close open file handles in files library
2014-08-14 10:57:54 +02:00
Thomas Müller
a4932dc5e2
in order to prevent false-positives on the code checker - exec and eval will not longer be grepped for
2014-08-14 10:48:42 +02:00
Thomas Müller
6d94fc846d
Merge pull request #10394 from owncloud/close-filehandle-lib-image
...
Close file handle if exception occurs in image class
2014-08-13 22:41:33 +02:00
Volkan Gezer
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
Robin Appelman
bba59bf815
Cast file id's to int so we can compare them properly
2014-08-13 19:18:34 +02:00
Bjoern Schiessle
d9f35d8c15
we need the recipient as a additional parameter to know for which share the notification was send
2014-08-13 17:02:51 +02:00
blizzz
54491e8c68
Merge pull request #10323 from gekmihesg/master
...
Load authentication backends before tryBasicAuth
2014-08-13 16:08:48 +02:00
Morris Jobke
c6bf51c457
Close open file handles in files library
...
ref #10392
2014-08-13 15:48:32 +02:00
Morris Jobke
f61658945f
Close file handle if exception occurs in image class
...
ref #10392
2014-08-13 15:19:58 +02:00
Normal Ra
1c1fc0870a
Remove stray tab characters.
2014-08-13 11:24:02 +02:00
Jenkins for ownCloud
609a52ebe2
[tx-robot] updated from transifex
2014-08-13 01:54:44 -04:00
Robin Appelman
174805f5e3
Merge pull request #9762 from owncloud/owner-public
...
Return the proper owner for home storages
2014-08-12 14:29:17 +02:00
Normal Ra
1633ec5c87
APK mimetype icon to be a generic package icon.
2014-08-12 14:10:49 +02:00
Normal Ra
38498af171
Add APK mimetype repair scenario.
2014-08-12 14:07:10 +02:00
Clark Tomlinson
e63853a353
Merge pull request #10335 from owncloud/fix-emptyapplist
...
Fix issue when no apps are enabled
2014-08-11 16:16:18 -04:00
Thomas Müller
3e493501da
Merge pull request #9890 from owncloud/check-php-charset-master
...
setting and checking default_charset in php.ini to be UTF-8
2014-08-11 22:11:11 +02:00
Vincent Petry
a32eac1477
Fix issue when no apps are enabled
...
Properly initialize $apps array
2014-08-11 20:36:51 +02:00
Clark Tomlinson
691306cf4e
Removing ini charset override due to shared hosting issues
2014-08-11 12:15:36 -04:00
Joas Schilling
564bf23c1b
Do not filemtime() on "." directory. Use empty string instead
...
Fix #9928
2014-08-11 17:39:37 +02:00
Joas Schilling
d7666d9d3d
Remove doubled slash between folder and path
2014-08-11 16:50:52 +02:00
Clark Tomlinson
7bc313a0cd
Merge pull request #10066 from marc0s/issues/10065-fix-null-check
...
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
2014-08-11 10:44:47 -04:00
Thomas Müller
13d44f8f7f
Merge pull request #10251 from owncloud/fix-dav-attributes-master
...
shared files/folders are not mounted
2014-08-11 14:40:47 +02:00
Vincent Petry
79fa2bc391
Merge pull request #10301 from owncloud/fix-internal-mail-share-links
...
Don't use /Shared as a base for links in share email
2014-08-11 13:33:39 +02:00
Vincent Petry
f2001a48a4
Fixed sort algo for additional cases
2014-08-11 13:28:53 +02:00
Vincent Petry
173059f6d0
Fixed file list sorting
...
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)
- added OC.Util.naturalSortComparator that uses the same algo that was
used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Thomas Müller
b83d00f847
Merge pull request #10249 from mroi/patch-1
...
file size on non-(Linux/BSD/Windows)-installations
2014-08-11 13:02:01 +02:00
Jenkins for ownCloud
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
gekmihesg
578a57f0fb
Load authentication backends before tryBasicAuth
2014-08-10 13:29:32 +02:00
Jenkins for ownCloud
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
Jenkins for ownCloud
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
Tom Needham
aeef10eb47
Add scrollto to the url if sharing a file for long file lists
2014-08-09 00:21:29 +01:00
Tom Needham
16dafa9cac
Fix link to files and folders in internal share emails
2014-08-09 00:08:45 +01:00
Bjoern Schiessle
6dda30b5a2
remove share permissions if user is excluded from sharing
2014-08-08 12:16:54 +02:00
Jenkins for ownCloud
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
Morris Jobke
b6a2a85bb8
Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf
...
implement a txt preview fallback for the case that ttf is not support
2014-08-07 22:55:06 +02:00
Thomas Müller
520f6422ac
Merge pull request #10079 from owncloud/Improve_scanner_message
...
Improved scanner error message
2014-08-07 16:09:52 +02:00
Thomas Müller
9d2cff50ed
shared files/folders are not mounted
2014-08-07 16:01:13 +02:00
Michael Roitzsch
cde1a9241d
file size on non-(Linux/BSD/Windows)-installations
...
Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
2014-08-07 15:41:58 +02:00
Thomas Müller
e33fc2807c
Merge pull request #10142 from owncloud/fix-#9283-gzip_support
...
Removed broken tar cutter, added tar and fixed extension switch.
2014-08-07 14:53:31 +02:00
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Thomas Müller
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
Jenkins for ownCloud
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
Volkan Gezer
173538befb
typo fix from transifex suggestion
2014-08-06 20:48:26 +02:00
Robin Appelman
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
Robin Appelman
1deb6aadd3
return null instead of throwing an exception
2014-08-06 12:06:41 +02:00
Thomas Müller
a72dae6842
Merge pull request #10144 from owncloud/issue/9972
...
Issue/9972 Fix issues with group and username `0`
2014-08-06 09:53:13 +02:00
Jenkins for ownCloud
e902e3f659
[tx-robot] updated from transifex
2014-08-06 01:54:43 -04:00
Morris Jobke
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle
48c57b80e3
remove trailing slash from path
2014-08-05 20:34:32 +02:00
Björn Schießle
d35bfc9a4c
Merge pull request #9520 from owncloud/theme_urls
...
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 17:53:18 +02:00
Robin Appelman
bf8f910a32
Fix Folder::getById
2014-08-05 16:58:10 +02:00
Morris Jobke
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Robin Appelman
244d4e1399
Make View->shouldEmitHooks more robust
2014-08-05 16:53:28 +02:00
Morris Jobke
8561d0dfca
remove escaping because it's unneeded
2014-08-05 13:18:38 +02:00
Morris Jobke
7b222c4ab5
fix uppercase issue
2014-08-05 13:16:51 +02:00
scolebrook
2e127d2c5e
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 13:16:51 +02:00
Bjoern Schiessle
41cca70a63
don't display share permission if resharing was disabled by the admin
2014-08-05 10:57:51 +02:00
Morris Jobke
c0e78d9841
Merge pull request #10151 from owncloud/issue/9912
...
Increase word wrap limit for emails to 78 characters
2014-08-05 08:20:57 +02:00
Jenkins for ownCloud
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
Joas Schilling
303f6da76f
Check return of fopen() before using it
...
Fix #9968
2014-08-04 17:53:06 +02:00
Joas Schilling
f4c7e3c1e9
Merge pull request #10083 from th3fallen/fix-9969-take-two
...
Fix 9969
2014-08-04 17:41:03 +02:00
Thomas Müller
66a3a641b9
Merge pull request #10138 from owncloud/innodb-repair-non-oc
...
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 16:23:46 +02:00
Joas Schilling
c1b8d93cb0
Increase word wrap limit for emails to 78 characters
2014-08-04 16:05:09 +02:00
Joas Schilling
4865c52aa6
Fix isLoggedIn() check for user '0'
...
Fix #9972
2014-08-04 15:53:55 +02:00
Joas Schilling
f80baf03d4
Fix getting group '0' from database backend
...
Fix #9972
2014-08-04 15:53:55 +02:00
Remco Brenninkmeijer
cb842ba793
Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.
2014-08-04 14:10:09 +02:00
Robin Appelman
8b4d3c065c
only set core version at the end
2014-08-04 13:42:16 +02:00
Robin Appelman
ae263da69a
Also set the app version when updating from app store
2014-08-04 13:41:05 +02:00
Robin Appelman
776cc45a5a
Allow loading app without checking the upgrade
2014-08-04 13:41:05 +02:00
Robin Appelman
4602d1f2a6
extract upgrade parts to their own methods
2014-08-04 13:41:05 +02:00
Robin Appelman
4608f8a3b5
Throw an exception when we try to load an app that needs to be upgraded
2014-08-04 13:41:04 +02:00
Robin Appelman
43d790239d
Extend OC_Util::needUpgrade to also catch app upgrades
2014-08-04 13:41:04 +02:00
Robin Appelman
ca463f9c10
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 13:14:12 +02:00
Thomas Müller
65903a012a
Merge pull request #10025 from owncloud/l10n-typo
...
typo fix from transifex suggestion
2014-08-04 11:03:50 +02:00
Jenkins for ownCloud
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
Volkan Gezer
7a07690b25
expire -> expiration
2014-08-02 04:02:39 +02:00
Jörn Friedrich Dreyer
a0ab4c2434
fix return documentation
2014-08-01 13:42:35 +02:00
Thomas Müller
378f35f0ec
prevent PHP errors and enhance logging
2014-08-01 09:54:32 +02:00
Jenkins for ownCloud
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
Volkan Gezer
5f015067f4
suggestions by deepdiver
2014-08-01 01:39:52 +02:00
Clark Tomlinson
26af116fcd
Removing unnecessary switch statements in fopen methods.
2014-07-31 09:34:27 -04:00
Martin
d975012ae6
Improved scanner error message
2014-07-31 13:12:35 +02:00
Thomas Müller
4eb2b4e1b0
Merge pull request #10051 from owncloud/preview-empty-text
...
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
Jenkins for ownCloud
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
marc0s
f2e20757f6
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
...
Fixes #10065
2014-07-30 23:24:55 +02:00
Jan-Christoph Borchardt
5b11a18dea
Merge pull request #10044 from owncloud/transparency_fix
...
extract transparency fix from #8050
2014-07-30 18:36:51 +02:00
Morris Jobke
521934ee0d
Merge pull request #10029 from owncloud/fix-thirdparty
...
Fix silent crash if 3rdparty dir is not available
2014-07-30 18:34:55 +02:00
Morris Jobke
62b37fbb99
Merge pull request #10024 from owncloud/preview-restrict-height
...
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
Jörn Friedrich Dreyer
dd9347fdd2
Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload
...
Cache factory needs to use globalPrefix in createLowLatency()
2014-07-30 16:56:45 +02:00
Robin Appelman
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
Georg Ehrke
fa461befbc
extract transparency fix from #8050
2014-07-30 16:13:33 +02:00
Morris Jobke
38e309b0fe
Merge pull request #9970 from owncloud/sharing_set_expire_date
...
Sharing set expire date
2014-07-30 14:37:16 +02:00
Volkan Gezer
90d8f42d7c
typo fix from transifex suggestion
2014-07-30 14:07:32 +02:00
Victor Dubiniuk
eb9bd200fa
Replace exit with return
2014-07-30 14:03:31 +02:00
Victor Dubiniuk
31e7fdb9bf
Fix silent crash if 3rdparty dir is not available
2014-07-30 14:03:31 +02:00
Robin Appelman
c066320208
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 13:52:40 +02:00
Victor Dubiniuk
0113ad0b33
Log unsuccessful temp file creation and return false
2014-07-30 13:50:41 +02:00
Thomas Müller
54d5d03271
Merge pull request #9888 from owncloud/mysql-tinyint-master
...
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-30 11:48:10 +02:00
Thomas Müller
7d6221d25d
Merge pull request #9914 from owncloud/fix-appframework-blank-template
...
Fix template rendering for 'blank' templates
2014-07-30 10:31:15 +02:00
Jenkins for ownCloud
47e72917e5
[tx-robot] updated from transifex
2014-07-30 01:55:32 -04:00
Morris Jobke
889088f72d
Fix template rendering for 'blank' templates
2014-07-29 16:49:50 +02:00
Björn Schießle
a36c4402f5
Merge pull request #9988 from owncloud/sharing_remove_share_permission
...
remove share permission if user is excluded from sharing
2014-07-29 14:05:13 +02:00
Andreas Fischer
a8fbc709ce
Add registerAutoloaderCache().
2014-07-29 11:18:40 +02:00
Andreas Fischer
9be8ac5867
Memcache\Factory: Remove static, use globalPrefix.
2014-07-29 11:14:36 +02:00
Andreas Fischer
da391b8932
InstanceId is properly injected into factory. Remove comment.
2014-07-29 11:03:10 +02:00
Bjoern Schiessle
67e302885c
remove share permission if user is excluded from sharing
2014-07-29 10:08:08 +02:00
Thomas Müller
58472a2660
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-29 09:18:37 +02:00
Jenkins for ownCloud
29a3f1e2af
[tx-robot] updated from transifex
2014-07-29 09:16:02 +02:00
Bjoern Schiessle
4e87ac2bb9
make sure that we set the expire date if a date is adefault date is set
2014-07-28 22:45:03 +02:00
Björn Schießle
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Morris Jobke
1fbbaed261
Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster
...
generate copy of sqlite database file in data directory
2014-07-28 16:54:52 +02:00
Robin Appelman
cb0ff19dc4
Merge pull request #9924 from owncloud/eventsource-nginx-buffering
...
Prevent nginx from buffering event source events
2014-07-28 16:17:35 +02:00
Georg Ehrke
4e8e69dc81
implement a txt preview fallback for the case that ttf is not support
2014-07-28 13:05:08 +02:00
Thomas Müller
539d2b7ec3
Merge pull request #9784 from josh4trunks/libreoffice_match_cl
...
Cleanup Document Preview
2014-07-28 13:03:33 +02:00
Thomas Müller
a3411e3719
Merge pull request #9641 from owncloud/localuser-addressbook
...
ownCloud users are exported as address book
2014-07-28 12:18:56 +02:00
Thomas Müller
534fb9ebf9
Merge pull request #9631 from owncloud/update-getid3
...
update getID3 library
2014-07-28 11:51:36 +02:00
Thomas Müller
11214219f3
Merge pull request #9819 from owncloud/updater-setversionafterupdate
...
Set version AFTER a successful update
2014-07-28 11:19:57 +02:00
Thomas Müller
0aa652ecfd
Merge pull request #9859 from tiezdne/master
...
Update mimetypes.list.php
2014-07-28 11:16:43 +02:00
Thomas Müller
cfaa05cc0e
Merge pull request #9905 from owncloud/joblist-non-existing-class
...
Dont try to execute jobs that no longer exist
2014-07-28 11:09:27 +02:00
Thomas Müller
ab8efe3aa2
Merge pull request #9935 from owncloud/harden-get-urlco
...
Verify whether the URL is valid
2014-07-28 11:07:41 +02:00
Thomas Müller
c87f425fe7
generate copy of sqlite database file in data directory
2014-07-28 10:29:39 +02:00
Thomas Müller
f2982b7a08
Merge pull request #9904 from owncloud/loggedout-getuserfolder
...
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-28 10:04:01 +02:00
Thomas Müller
37f673c8b5
Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master
...
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-28 09:40:40 +02:00
Jenkins for ownCloud
a169572223
[tx-robot] updated from transifex
2014-07-28 01:54:30 -04:00
Lukas Reschke
260729fd7d
Verify whether the URL is valid
...
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017
@karlitschek Backport for stable6 and stable7 requested.
2014-07-27 16:46:32 +02:00
Jenkins for ownCloud
9a4d2871eb
[tx-robot] updated from transifex
2014-07-27 01:54:31 -04:00
Robin Appelman
2c4e06d325
Prevent nginx from buffering event source events
2014-07-26 16:07:11 +02:00
Jenkins for ownCloud
010732019a
[tx-robot] updated from transifex
2014-07-26 01:54:40 -04:00
Michael Kuhn
ecdd04374a
Allow specifying the item source in unshareFromSelf().
2014-07-26 02:00:49 +02:00
Jörn Friedrich Dreyer
ec7a10f882
reorder if statements to remove negation, indentation correction
2014-07-25 19:39:29 +02:00
Robin Appelman
43978befda
Dont try to execute jobs that no longer exist
2014-07-25 18:02:02 +02:00
Robin Appelman
acafb4a426
Merge pull request #9669 from owncloud/group-public
...
Add group management to the public api
2014-07-25 17:55:12 +02:00
Robin Appelman
bf12bba079
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-25 17:52:50 +02:00
Morris Jobke
ae3761f15d
add autoload
2014-07-25 17:37:33 +02:00
Morris Jobke
a9666c4f5b
update getID3 library
2014-07-25 15:25:45 +02:00
Bjoern Schiessle
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
Thomas Müller
07dc0b2fdf
setting and checking default_charset in php.ini to be UTF-8
2014-07-25 09:53:25 +02:00
Jenkins for ownCloud
3f58d949e0
[tx-robot] updated from transifex
2014-07-25 01:54:32 -04:00
Thomas Müller
176ecbd311
ownCloud users are exported as address book
2014-07-24 17:35:02 +02:00
Thomas Müller
788a2eca2f
Merge pull request #9841 from owncloud/fix-password-reset-master
...
Fix password reset in console command and lost password controller
2014-07-24 15:58:02 +02:00
tiezdne
6a2f3921f6
Update mimetypes.list.php
2014-07-24 15:43:55 +02:00
Thomas Müller
2594fb80aa
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-24 13:45:06 +02:00
Thomas Müller
a8b6cc6a07
- adding default value for $recoveryPassword
...
- set password correctly in lost password
2014-07-24 12:50:39 +02:00
Thomas Müller
7d60f7a222
register type mappings for unknown/unsupported mysql types
2014-07-24 12:17:26 +02:00
Vincent Petry
6f329dcb6c
Set version AFTER a successful update
...
If an app upgrade failed, the core version will not be increased either
in the database. This will re-display the update page and make it
possible to redo the apps upgrade.
Note that any core repair routine must take into account that an update
might need to be redone again even though the core's DB state is already
the one of the new version.
2014-07-23 23:38:17 +02:00
Thomas Müller
363ba04f5e
only commit in case a transaction is active
2014-07-23 20:13:19 +02:00
josh4trunks
acd5660492
Cleanup Document Preview
...
Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php .
This will stop the creating of multiple directories for document conversion in tmpDir.
2014-07-22 22:46:38 -07:00
Sander
4e2954673a
Revert change
2014-07-22 19:45:01 +02:00
Sander
eacdf26cde
Allow getAppFolder to get another apps path
...
cc @Raydiation
2014-07-22 16:07:43 +02:00
Thomas Müller
0567fd031f
Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
...
adding special handling of checkPrecondition() for chunked upload
2014-07-22 15:47:55 +02:00
Thomas Müller
8ed6adaf85
Merge pull request #9738 from owncloud/remove-uneeded-strip
...
Remove uneeded strip_tags
2014-07-22 15:06:23 +02:00
Thomas Müller
31149fb1c3
adding special handling of checkPrecondition() for chunked upload
2014-07-22 13:06:20 +02:00
Robin Appelman
e9de20952a
Return the proper owner for home storages
2014-07-21 16:59:59 +02:00
Joas Schilling
677c0288fb
Merge pull request #9757 from owncloud/issue/9756
...
Add language parameter to public API for getL10N()
2014-07-21 16:50:48 +02:00
Joas Schilling
01878153e0
Add language parameter to public API for getL10N()
...
Fix #9756
2014-07-21 14:50:34 +02:00
Thomas Müller
0a9e0d1051
perm -> permissions
2014-07-21 13:49:22 +02:00
Vincent Petry
3df7a83c72
Merge pull request #9406 from philfry/master
...
silently discard the response body, needed for apache/mod_dav and maybe ...
2014-07-21 12:22:06 +02:00
Morris Jobke
76a5fa11f5
Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master
...
check if $tables is an array
2014-07-20 21:40:53 +02:00
Andreas Fischer
8cd1f7464e
Merge pull request #9672 from owncloud/mysql-affectedrows
...
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-20 21:29:16 +02:00
Thomas Müller
f0c0bd5251
check if $tables is an array
2014-07-19 20:23:38 +02:00
Lukas Reschke
1c16d012ab
Remove uneeded `strip_tags`
...
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-19 10:17:24 +02:00
Jenkins for ownCloud
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
Andreas Fischer
bfd59bddf4
Extract Auth Header logic into new function handleAuthHeaders().
2014-07-19 02:21:18 +02:00
Andreas Fischer
fafed17c60
Deduplicate user/password extraction from alternative HTTP headers.
2014-07-19 02:06:37 +02:00
Jenkins for ownCloud
80983f5853
[tx-robot] updated from transifex
2014-07-18 01:54:43 -04:00
Frank Karlitschek
f92b5a2507
update appstore api url
2014-07-17 21:54:46 -04:00
Vincent Petry
77d6d11b91
Merge pull request #9682 from owncloud/mappedlocal-rename
...
Fix renaming files in the root folder of a MappedLocal storage
2014-07-17 09:19:17 +02:00
Jenkins for ownCloud
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
Robin Appelman
5a0397eb5e
Fix renaming files in the root folder of a MappedLocal storage
2014-07-16 21:24:18 +02:00
icewind1991
d58c8d72cf
Merge pull request #9550 from kofemann/dcache-fixes-for-upstream
...
storage: do not check file mode on rename
2014-07-16 16:06:14 +02:00
Andreas Fischer
d8bd8c4b66
Document why we have to check with defined() first.
2014-07-16 15:13:35 +02:00
Andreas Fischer
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
Robin Appelman
94fa21d146
Add group management to the public api
2014-07-16 14:25:31 +02:00
Stephan Peijnik
4d74aa09bf
Port of #9584
...
Fixes #9583
lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Fix indentation.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Renamed $grp to $group in foreach loop.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Use is_null() instead of empty() when checking the return value of GroupManager::get().
Additionally, $grp was renamed to $group inside
\OC\Group\MetaData::fetchGroups().
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Updated code to reflect changes introduced to \OC\Group\MetaData.
Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-16 12:23:26 +02:00
Björn Schießle
7d8a8e78fa
Merge pull request #9640 from owncloud/fix_9627
...
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-16 10:12:52 +02:00
Jenkins for ownCloud
0155326227
[tx-robot] updated from transifex
2014-07-16 01:55:55 -04:00
Thomas Müller
0f9b22107b
Merge pull request #9644 from owncloud/fix_user_api
...
Fix user api
2014-07-15 23:57:02 +02:00
blizzz
10b59f101f
Merge pull request #9540 from owncloud/use_fileinfo_in_search_results
...
use fileinfo object in search results
2014-07-15 19:49:36 +02:00
Bjoern Schiessle
6967d328e2
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-15 17:48:25 +02:00
Jörn Friedrich Dreyer
818929274d
use UserSession service to resolve user id
2014-07-15 17:42:17 +02:00
Jörn Friedrich Dreyer
b3106c321c
use correct IUser in interface
2014-07-15 17:41:44 +02:00
Vincent Petry
a8d95356ca
Merge pull request #8987 from owncloud/lastindexid-debug
...
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
2014-07-15 17:01:57 +02:00
icewind1991
61b5a770e4
Merge pull request #9561 from libasys/patch-3
...
Fix Error undefined index: file_target
2014-07-15 16:54:57 +02:00
Thomas Müller
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00
Jörn Friedrich Dreyer
4a855be814
fix logger implementation and test
2014-07-15 10:10:16 +02:00
Jenkins for ownCloud
ff11ef3c5b
[tx-robot] updated from transifex
2014-07-15 01:55:20 -04:00
Thomas Müller
e8f02b9410
Merge pull request #9562 from owncloud/users-groupfilter
...
Do not filter groups, but therefore update the user counts according to the filter
2014-07-15 07:40:55 +02:00
Thomas Müller
73e2bf7bf4
fixing PHPDoc
2014-07-14 21:26:47 +02:00
Arthur Schiwon
ab2c7e06a4
remove dead code
...
do not filter groups. but update the user count according to the filter
improve phpdoc
improve metadata runtime cache
add metadata tests
2014-07-14 21:26:37 +02:00
Jörn Friedrich Dreyer
8f11019f45
mkae getRelativePath of file search results overwriteable in subclasses
2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer
eea5c2ee0a
return relative path
2014-07-14 19:12:06 +02:00
Robin Appelman
c3991ae13e
Use the correct path when building the FileInfo for the search result
2014-07-14 18:32:45 +02:00
Morris Jobke
9ee1c7ff71
Merge pull request #9228 from owncloud/remove-routing-singular-issues
...
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
2014-07-14 17:10:07 +02:00
Thomas Müller
4b91741875
Merge pull request #9598 from owncloud/fix-app-installation-master
...
append file extension to the temporary file which contains the downloade...
2014-07-14 17:05:36 +02:00
Vincent Petry
10a29556b0
- Added test to trigger index id error
...
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
Robin Appelman
51d0bdc90c
Expose the user manager in the public server container
2014-07-14 15:10:56 +02:00
Robin Appelman
20c1ce7f47
Add public interfaces for User, UserManager and UserSession
2014-07-14 15:10:51 +02:00
Björn Schießle
05ba9b3c64
Merge pull request #9539 from enoch85/patch-1
...
Fix for #9422
2014-07-14 12:58:23 +02:00