Thomas Müller
c353cbe633
Merge pull request #11689 from owncloud/doctrine-2.5
...
Update doctrine/dbal to 2.5
2014-10-29 11:34:23 +01:00
Thomas Müller
fb4f993336
Fix implementation of translation short cut
2014-10-29 10:58:10 +01:00
Vincent Petry
c682b1f0c1
Fix language file detection
2014-10-29 10:13:51 +01:00
Thomas Müller
9f7c571e40
update all translation files to js and json
2014-10-29 10:13:50 +01:00
Thomas Müller
2f19de11e4
adding console command to generate javascript translation files based on existing php translation files
...
read server side translations from json files
2014-10-29 10:09:12 +01:00
Vincent Petry
d71cd680dd
Include core translations
...
Moved search result type translations to search.js
Load JS translations earlier
Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.
This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78
in case a translation javascript is not found we no longer bail out
...
remove translation.php
2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad
add dataresponse
...
fix docstrings
adjust copyright date
another copyright date update
another header update
implement third headers argument, fix indention, fix docstrings
fix docstrings
2014-10-29 09:43:47 +01:00
Jenkins for ownCloud
cb944814d9
[tx-robot] updated from transifex
2014-10-29 01:54:45 -04:00
Thomas Müller
46c2909c78
Update doctrine/dbal to 2.5
2014-10-28 15:39:37 +01:00
Robin Appelman
2974d4d380
Reset the users setup after clearing mounts
2014-10-28 15:13:29 +01:00
Thomas Müller
c93ddf77b9
Use composer autoloader to load Patchwork
2014-10-28 13:42:28 +01:00
Adam Williamson
0e3f2055d2
use Composer autoloader not OC for non-Composer 3rdparty ( #9643 )
...
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.
With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.
Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.
drop unneeded registerPrefix() and registerClass() from autoloader
Now we're not handling anything but OC's own classes, these are
unnecessary.
error out if composer autoloader is not found (thanks bantu)
We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
2014-10-28 11:32:20 +01:00
Lukas Reschke
510d0b2cf3
Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter
...
Also support closing tags with no text content given
Conflicts:
lib/private/template.php
2014-10-28 11:15:58 +01:00
Morris Jobke
4461e69873
Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling
...
Properly catch 503 storage not available in getQuotaInfo
2014-10-28 09:33:54 +01:00
Jenkins for ownCloud
23873d80fe
[tx-robot] updated from transifex
2014-10-28 01:55:38 -04:00
Lukas Reschke
d6380a5395
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
...
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51
code cleanup during review 👍
2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9
Make supported DBs configurable within config.php
...
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.
To test this play around with the new configuration parameter "supportedDatabases".
2014-10-27 21:39:34 +01:00
Robin Appelman
3f63f4b6b1
Only mount the storages for the user once
2014-10-27 18:50:28 +01:00
Vincent Petry
21d825ed6c
Properly catch 503 storage not available in getQuotaInfo
...
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.
This fix prevents the expected exception to make the whole call fail.
2014-10-27 16:27:12 +01:00
Morris Jobke
a00712aa65
Merge pull request #11783 from owncloud/allow_passing_driver_options
...
allow passing db driver options
2014-10-27 16:00:13 +01:00
Robin Appelman
8de287f2ef
Merge pull request #11763 from owncloud/stable-etags
...
Generate stable etags for local files
2014-10-27 15:30:30 +01:00
Morris Jobke
290e9cd5b2
Merge pull request #11787 from owncloud/fix-php-docs
...
Fix PHPDoc
2014-10-27 14:46:41 +01:00
Lukas Reschke
f7c393fa9f
Fix PHPDoc
...
Stop my IDE and Scrutinizer from complaining.
2014-10-27 13:38:40 +01:00
Jörn Friedrich Dreyer
e16a58220d
allow passing driver options, fixes #11718
2014-10-27 12:30:29 +01:00
Vincent Petry
aee1edf6b5
Merge pull request #11708 from owncloud/fix-momentjs
...
Setting moment locale based on user selection
2014-10-27 10:30:47 +01:00
Jenkins for ownCloud
5d391910c5
[tx-robot] updated from transifex
2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a
[tx-robot] updated from transifex
2014-10-26 01:54:32 -04:00
Lukas Reschke
acec1afe17
Merge pull request #11760 from owncloud/add-type-hints-where-sensible
...
Add type hinting to functions
2014-10-25 14:09:48 +02:00
Morris Jobke
be32e562e3
drop unneeded hint
2014-10-25 12:00:56 +02:00
Jenkins for ownCloud
3652f02e48
[tx-robot] updated from transifex
2014-10-25 01:54:35 -04:00
Morris Jobke
63f2b1f460
Merge pull request #11767 from danbartram/add_db_rollback
...
Add missing DB rollback functionality
2014-10-24 19:52:56 +02:00
Thomas Müller
9fa5483111
Merge pull request #11709 from owncloud/temp-handling
...
Cleanup handling of temporary files
2014-10-24 19:29:05 +02:00
Dan Bartram
9c1015b790
Add missing DB rollback functionality
2014-10-24 17:44:06 +01:00
Robin Appelman
283c10f010
Generate stable etags for local files
2014-10-24 16:47:58 +02:00
Lukas Reschke
f901c5ff08
Fix PHPDoc and remove explicit type hint
2014-10-24 15:49:55 +02:00
Lukas Reschke
b3a04840b5
Add type hinting to functions
...
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
Robin Appelman
16cfca6a5f
Better reuse of cache data for getFolderContents
2014-10-24 12:33:54 +02:00
Robin Appelman
0a3f57f832
Pass the cached data to the filesystem watcher
2014-10-24 12:32:55 +02:00
Lukas Reschke
d060180140
Use function outside of loop
...
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Robin Appelman
0b96297783
Use the TempManager to handle temporary files
2014-10-24 12:18:49 +02:00
Robin Appelman
83c74b80ad
Add \OC\TempManager to handle creating and cleaning temporary files
2014-10-24 12:18:46 +02:00
Lukas Reschke
2d2a4741ce
Make files non executable
...
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
libasys
cbd130bed0
adding missing email address for principal
...
* fix #8515
* add mail only if it exists
2014-10-24 11:12:23 +02:00
Jenkins for ownCloud
9babcfb9e2
[tx-robot] updated from transifex
2014-10-24 01:55:11 -04:00
Morris Jobke
4b5a3876ac
Merge pull request #7749 from owncloud/load_avatar_header_via_php
...
Load avatar in header via PHP
2014-10-24 01:27:25 +02:00
kondou
729dffed5e
Load avatar in header via PHP
...
* fix #7484
* use UID, css, and div instead of span
2014-10-23 23:17:18 +02:00
Lukas Reschke
c30b7f8197
Remove unreachable statement
2014-10-23 23:03:14 +02:00
Clark Tomlinson
ca5abe5744
Setting moment locale based on user selection
2014-10-23 10:32:47 -04:00
Thomas Müller
e26a16afea
Merge pull request #11549 from owncloud/add-more-localizations-master
...
implement localizations based on punic
2014-10-23 16:09:47 +02:00
Thomas Müller
6c1871da06
Merge pull request #10985 from owncloud/db-cleanup
...
Cleanup database handling
2014-10-23 13:48:33 +02:00
Morris Jobke
b82e44b448
Merge pull request #10689 from owncloud/load_classfile_once
...
make sure class file is loaded once
2014-10-23 11:41:00 +02:00
Jenkins for ownCloud
e75c2edba6
[tx-robot] updated from transifex
2014-10-23 01:55:51 -04:00
Lukas Reschke
e9ec45ddd1
Merge pull request #11704 from owncloud/fix-type-for-query
...
Use mixed as type
2014-10-22 18:13:31 +02:00
blizzz
44a7a3690a
Merge pull request #11702 from owncloud/fix-11637
...
setup filesystem by username, not login name, fixes #11637
2014-10-22 17:56:30 +02:00
Lukas Reschke
be06937e65
Use mixed as type
...
Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.
2014-10-22 15:09:33 +02:00
Jörn Friedrich Dreyer
b7fa644a54
Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master
...
Special treatment for Oracle
2014-10-22 14:54:42 +02:00
Lukas Reschke
31e489b44d
Merge pull request #11687 from owncloud/appframework-session-annotation
...
introduce SessionMiddleWare to control session handling via an annotatio...
2014-10-22 14:45:28 +02:00
Arthur Schiwon
993376fb6f
better variable name
2014-10-22 13:36:57 +02:00
Arthur Schiwon
e0342db47c
set up FS by username, not login name\!
2014-10-22 13:28:08 +02:00
Thomas Müller
02c5933af8
introduce SessionMiddleWare to control session handling via an annotation
2014-10-22 12:44:19 +02:00
Robin Appelman
d83b11d34a
Use statements wrapper in \OCP\IDB
2014-10-22 12:29:53 +02:00
Robin Appelman
e6f6cdd19f
Bit more cleanup
2014-10-22 12:29:53 +02:00
Robin Appelman
2ae6a0d96d
Move creating the database connection to the server container
2014-10-22 12:29:53 +02:00
Robin Appelman
d4e929c37a
Remove implicit prepared statement cache and get the connection from the server container in \OC_DB
2014-10-22 12:26:43 +02:00
Robin Appelman
97a6f5c46b
Extend \OCP\IDBConnection to cover more use cases
2014-10-22 12:26:43 +02:00
Robin Appelman
72f99f5041
Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead
2014-10-22 12:26:43 +02:00
Bjoern Schiessle
b7718bc212
always use the correct share type
2014-10-22 11:48:29 +02:00
Morris Jobke
e2ff180521
Merge pull request #11416 from owncloud/eventlogger
...
Allow apps to gather performance diagnistics
2014-10-22 11:18:26 +02:00
Jenkins for ownCloud
916e710ece
[tx-robot] updated from transifex
2014-10-22 01:55:22 -04:00
Thomas Müller
2814a294c8
call initPaths() right before the server is instantiated
2014-10-21 14:10:57 +02:00
Lukas Reschke
cb36666600
Merge pull request #11630 from owncloud/kill-some-legacy
...
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
Jenkins for ownCloud
8485743e33
[tx-robot] updated from transifex
2014-10-21 01:55:45 -04:00
Lukas Reschke
8f8abdbaee
Add unit tests for convertToRelativePath
2014-10-20 15:09:43 +02:00
Lukas Reschke
7b94c7f9c1
Refer to relative path instead of absolute path
...
There is no need to refer to the absolute path here if we can use the relative one.
Conflicts:
lib/private/templatelayout.php
2014-10-20 15:09:43 +02:00
Thomas Müller
c8e8945efb
implement localizations based on punic
2014-10-20 15:04:42 +02:00
Thomas Müller
d9907b6fa3
move some deprecated usage of OC_Config and OC_AppConfig to \OC::server
2014-10-20 14:44:44 +02:00
Thomas Müller
6af0e76a03
remove legacy class OC_Updater
2014-10-20 14:44:42 +02:00
Robin Appelman
9fd234f63f
Log some additional events
2014-10-20 13:38:38 +02:00
Robin Appelman
beb1c6ad74
Allow adding events that hapend before the event logger was loaded
2014-10-20 13:38:38 +02:00
Robin Appelman
4a8358bc50
Rename to NullQueryLogger
2014-10-20 13:38:38 +02:00
Robin Appelman
1e69f5e7ac
Log some basic events
2014-10-20 13:38:38 +02:00
Robin Appelman
6e08014781
Rename namespace to Diagnostics
2014-10-20 13:38:38 +02:00
Robin Appelman
2790bda4f8
Activate the query logger on connect
2014-10-20 13:38:37 +02:00
Robin Appelman
b71d1d3616
Add QueryLogger interface to allow apps to get a list of used queries
2014-10-20 13:38:37 +02:00
Robin Appelman
d38050cf52
Add an EventLogger interface to allow apps to get a log of the request timeline
2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer
ca0e3fdfea
throw exception in writeBack, the returned boolean is checked nowhere
2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5
make skeleton compatible with objectstore
...
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud
87da62072b
[tx-robot] updated from transifex
2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
68dd1edbfe
[tx-robot] updated from transifex
2014-10-18 01:55:30 -04:00
Arthur Schiwon
4e8c7570d4
make performance less bad. Still far from good, but at least it works
2014-10-17 20:16:04 +02:00
Arthur Schiwon
a7a532f58a
with several backends, more than limit can be returned
2014-10-17 20:16:04 +02:00
Morris Jobke
7bf401e48a
Merge pull request #11430 from owncloud/minify-js-css-master
...
adding cssmin and jssmin(minify)
2014-10-17 15:05:59 +02:00
Lukas Reschke
439b33ec38
Merge pull request #11634 from owncloud/loadapps-encapsulaterequire
...
Encapsulate require_once to avoid name space bleedind
2014-10-17 14:32:10 +02:00
Vincent Petry
27c22f071d
Encapsulate require_once to avoid name space bleedind
...
The script required by require_once might use variable names like $app
which will conflict with the code that follows.
This fix encapsulates require_once into its own function to avoid such
issues.
2014-10-17 12:45:45 +02:00
Thomas Müller
93b0f1a3bf
adding cssmin and jssmin(minify)
...
adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content
adding repair step to clean the asset cache after upgrade + coding style adjustments
2014-10-17 12:22:26 +02:00
blizzz
688a141586
Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup
...
drastic ldap speedup (update)
2014-10-17 12:07:27 +02:00
Morris Jobke
f1a5ebd59d
Merge pull request #11611 from owncloud/fix-svg-master
...
Fix SVG icons
2014-10-17 12:01:27 +02:00
Lukas Reschke
af335a39f1
Add PHPDoc about sanitization of "insertIfNotExist"
...
Let's document this potential pitfall properly.
2014-10-17 11:06:49 +02:00
Jenkins for ownCloud
92f2914335
[tx-robot] updated from transifex
2014-10-17 01:58:25 -04:00
Lukas Reschke
53e0cf2f74
Add a try catch block
...
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
2014-10-16 21:45:09 +02:00
Thomas Müller
f7097faf82
Special treatment for Oracle
2014-10-16 17:02:15 +02:00
Lukas Reschke
a37dcf94fd
Merge pull request #11591 from owncloud/addAppVersionToCSSandJS
...
Add app version to JS and CSS
2014-10-16 15:54:57 +02:00
Lukas Reschke
5f3ddf5c80
Merge pull request #11383 from ockham/share-tags2
...
Share tags
2014-10-16 15:36:04 +02:00
Thomas Müller
a04159090f
include the apps' versions hash to invalidate the cached assets
2014-10-16 13:29:51 +02:00
Lukas Reschke
4deb57bfae
Remove insane comment
2014-10-16 12:42:00 +02:00
Lukas Reschke
9cfbf7ed1c
Fix SVG icons
...
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.
Conflicts:
lib/private/preview.php
2014-10-16 12:35:51 +02:00
blizzz
756f64d728
Merge pull request #11595 from owncloud/make_get_display_name_more_robust
...
strip whitespace from the beginning and end of the display name
2014-10-16 11:33:12 +02:00
Jörn Friedrich Dreyer
0254a3c406
make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space
2014-10-16 10:15:43 +02:00
Jenkins for ownCloud
c8d8578d1a
[tx-robot] updated from transifex
2014-10-16 01:56:30 -04:00
Lukas Reschke
63e0599218
Merge pull request #11565 from owncloud/fix-behaviourOnOSX
...
Add darwin to if block
2014-10-15 21:12:50 +02:00
Lukas Reschke
f82b996f57
Merge pull request #11528 from owncloud/use-raw-url
...
Use `rawurlencode` since this seems to be expected by cURL
2014-10-15 19:58:27 +02:00
Jörn Friedrich Dreyer
c27fd94ec8
in cli mode return true for isHtaccessWorking
2014-10-15 16:59:28 +02:00
Thomas Müller
b091394a90
introduce new app page layout
...
filter installed and not-installed apps properly
kill unneeded file
load category 'Installed' on page load
adding documentation links
new apps mgmt: first style adjustment
apps mgmt: only show license and preview if they exist
adding buttons
new apps mgmt: fix for mobile
use app icon if available
new apps mgmt: position enable/disable toggle to the right
new apps mgmt: proper display of icons or previews
new apps mgmt: fix loading spinner
reenable group selection for apps
new apps mgmt: position enable button normally again
new apps mgmt: clarify wording from 'Installed' to 'Enabled'
reintroduce enable/disable
Move rating image path generation to client-side
Move expression outside of l10n
fix group handling
add buttons for 'More apps' and 'Add your app' again
disable changed date of app for now
adding recommended label
style 'Recommended' app tag
fixing php warning
sort by rating
adding meta-category 'Recommended'
Only show existing documentation links
lacy loading of screenshots
making group based app activation work again
adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'
adding app.svg for all core apps
query string '?installed' is not longer needed
update and uninstall is back + error feedback
remove unneeded parameter
fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
Bjoern Schiessle
239bff5766
strip whitespace from the beginning and end of the display name to avoid empty display names
2014-10-15 14:54:35 +02:00
Vincent Petry
6824a5ce7f
Merge pull request #11538 from owncloud/webdav-creatable-info
...
Use the cached fileinfo to get creatable permissions
2014-10-15 14:39:07 +02:00
Lukas Reschke
6ccda2ae98
Add app version to JS and CSS
...
This leads to the regeneration of the hash in case a single application is updated.
Fixes https://github.com/owncloud/core/issues/11374
2014-10-15 14:00:20 +02:00
Vincent Petry
6fa03870e9
Merge pull request #11541 from owncloud/usersession-activeuser-setsession
...
Unset the cached active user when using a different session object
2014-10-15 13:31:05 +02:00
Vincent Petry
4650101674
Merge pull request #11548 from owncloud/extstorage-ocfields
...
Allow specifying protocol in ext storage OC config
2014-10-15 13:27:23 +02:00
Lukas Reschke
1b3feb710d
Use `rawurlencode` since this seems to be expected by cURL
...
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
2014-10-14 13:16:23 +02:00
Lukas Reschke
bf84cd4bcc
Add darwin to if block
...
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
2014-10-14 12:58:00 +02:00
Joas Schilling
0407bc0978
Set overwritemailurl* configs on setup
...
Correctly use overwritemailurl value when generating absolute urls in CLI
Fix #11500
Rename the config to *cli
Add overwrite.cli.url to the sample config
Revert separator fix, fixes unit test
2014-10-14 05:07:09 +02:00
Bernhard Reiter
b416f7d8ac
PHPDoc fixes as suggested by @MorrisJobke.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
1770179648
Add getTag() function for accessing of a single tag.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
bc265e8b52
Make loading of tags from DB more explicit.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
226d7233e1
In Tags::rename($from, $to), check if there already is a tag named $to.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7963125c41
Remove two obsolete try...catch blocks.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
5471189fe6
Implement Tag and TagMapper classes.
...
Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
cf6fb2c2e4
Remove redundant null initializations.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
3e5d725502
Test addMultiple() with $sync=true.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
b33cb0e342
Fix a comment.
2014-10-14 00:06:07 +02:00
Vincent Petry
e95372bf01
Merge pull request #11546 from owncloud/users-deletewithfilecache
...
Retrieve storage numeric id earlier when still available
2014-10-13 17:27:13 +02:00
Vincent Petry
ab5149f5df
Allow specifying protocol in ext storage OC config
...
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
Vincent Petry
d485c0098d
Retrieve storage numeric id earlier when still available
...
The numeric id is only available before the storage entry is deleted, so
get it at that time.
2014-10-13 15:52:48 +02:00
Bjoern Schiessle
c6c9a51b11
distinguish between file dependent shares and other shares
2014-10-13 15:04:54 +02:00
Robin Appelman
912fbfab01
Unset the cached active user when using a different session object
2014-10-13 13:11:48 +02:00
Robin Appelman
19de425a50
Use the cached fileinfo to get creatable permissions
2014-10-13 13:09:05 +02:00
Lukas Reschke
bf674487aa
Merge pull request #11367 from owncloud/removeIsMimeSupported
...
Remove uneeded slicing of element
2014-10-12 19:45:00 +02:00
Jenkins for ownCloud
a3635fedbb
[tx-robot] updated from transifex
2014-10-12 01:54:39 -04:00
Björn Schießle
87899db204
Merge pull request #11380 from owncloud/fix_performance_issue_sharing
...
[sharing] fix performance issues
2014-10-10 15:56:30 +02:00
Bjoern Schiessle
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
Vincent Petry
660e9c4012
Merge pull request #11501 from Ansud/master
...
Urlencode file name before passing it to cURL
2014-10-10 10:57:59 +02:00
Jenkins for ownCloud
2cc26c9022
[tx-robot] updated from transifex
2014-10-10 01:55:10 -04:00
Vincent Petry
9dea79e341
Merge pull request #11305 from owncloud/ext-updateetagonmount
...
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
Vincent Petry
c82e310e20
Merge pull request #11495 from owncloud/apps-clearenableappscacheafterloadingauthapp
...
Clear enabled apps cache after loading authentication app
2014-10-09 17:20:05 +02:00
Lukas Reschke
16cd749065
Add support for keys in the info.xml
...
This allows to have links to different doc base URLs
a.
2014-10-09 15:48:30 +02:00
Tony Zelenoff
2d03019c91
Urlencode file name before passing it to cURL
...
Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.
Signed-off-by: Tony Zelenoff <antonz@parallels.com>
2014-10-09 17:15:12 +04:00
Vincent Petry
36d22825e0
Clear enabled apps cache after loading authentication app
...
Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.
2014-10-09 14:34:41 +02:00
Jenkins for ownCloud
295c46ccb5
[tx-robot] updated from transifex
2014-10-09 01:55:33 -04:00
Jörn Friedrich Dreyer
3427976bb6
strict comparison
2014-10-08 18:49:55 +02:00
Jörn Friedrich Dreyer
aa3ad898a9
fix amazon s3 issues
...
folder size and mtime is always unknown in s3
more s3 fixes
make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings
reduce number of http calls on remove and rmdir
fix typo
2014-10-08 18:49:47 +02:00
Robin Appelman
12ac3a800d
Expose getAppKeys trough \OCP\IConfig
2014-10-08 14:22:17 +02:00
Vincent Petry
6585eaa5df
Added failing unit tests for mount config hooks
2014-10-08 14:22:17 +02:00
michag86
8abe441d4a
cleanup group admin(s) on deleteGroup
2014-10-08 14:05:06 +02:00
michag86
ca58ac50a2
fix for issue #10880
2014-10-07 16:07:48 +02:00
Vincent Petry
d7db006315
Revert "fix for issue #10880"
...
This reverts commit 0df070a8e4
.
2014-10-07 15:54:25 +02:00
michag86
0df070a8e4
fix for issue #10880
2014-10-07 14:30:14 +02:00
Morris Jobke
6323d5fb3a
Merge pull request #11437 from owncloud/add-import-filter
...
Add CssImportFilter. More elegant fix for documents#348
2014-10-07 08:28:08 +02:00
Jenkins for ownCloud
01be0af209
[tx-robot] updated from transifex
2014-10-07 01:54:46 -04:00
Victor Dubiniuk
b6087ea79b
Add CssImportFilter. More elegant fix for documents#348
2014-10-06 19:39:02 +03:00
Morris Jobke
a6293a38f2
Merge pull request #11390 from Nemesiz/master
...
Preview large TXT files fix
2014-10-06 14:25:27 +02:00
Jenkins for ownCloud
6e991a53ec
[tx-robot] updated from transifex
2014-10-06 01:54:57 -04:00
Olivier Paroz
b0000800e1
New generic class for Imagemagick conversions
2014-10-04 17:50:12 +02:00
Nmz
83c2829ca8
Preview large TXT files fix
...
Limit the size of the string generating the preview image for TXT files
2014-10-02 12:47:39 +03:00
Jenkins for ownCloud
553274b28f
[tx-robot] updated from transifex
2014-10-01 06:56:17 -04:00
Lukas Reschke
e762ff2bbd
Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain
...
Redirect only to absolute URL
2014-10-01 12:47:43 +02:00
Lukas Reschke
cbecd62287
Merge pull request #11303 from owncloud/addFilelockToConfig
...
Add flock to config
2014-10-01 10:43:18 +02:00
Morris Jobke
5beeb923e6
Merge pull request #11365 from owncloud/fix-phpdoc
...
Fix PHPDoc
2014-09-30 16:15:37 +02:00
Morris Jobke
e881be7926
Merge pull request #11366 from owncloud/invalid-doc
...
Remove invalid PHPDoc
2014-09-30 16:12:58 +02:00
Lukas Reschke
68cf6681e5
Add flock to config
...
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070
Testplan:
- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation
Only skip the main config
Otherwise read only additional configs might not be processed
Test on tmpdir
2014-09-30 15:53:27 +02:00
Lukas Reschke
96d9e0eb5b
Remove uneeded slicing of element
...
The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs.
Please notice that this is only relevant for master.
2014-09-30 14:08:43 +02:00
Lukas Reschke
67f8875f47
Remove invalid PHPDoc
...
Despite the documentation this function does not read values from the cookie
2014-09-30 13:46:43 +02:00
Lukas Reschke
b4944ffcc5
Fix PHPDoc
2014-09-30 13:34:50 +02:00
Jenkins for ownCloud
5292a14cdf
[tx-robot] updated from transifex
2014-09-30 01:55:11 -04:00
Lukas Reschke
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
Lukas Reschke
41374986d3
Remove dead code
2014-09-29 17:20:29 +02:00
Lukas Reschke
6e7365fc17
Redirect only to absolute URL
...
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
2014-09-29 17:07:43 +02:00
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