Joas Schilling
23046ca5b7
Inject the database connection
2015-11-30 17:14:47 +01:00
Lukas Reschke
391bc49dab
Move files/ajax/scan.php to background job
...
The background job will now be executed in chunks of 500 users all 10 minutes.
2015-11-28 13:06:53 +01:00
Vincent Petry
418fefc93c
Update app version for Webdav impl of files GUI
...
This will make sure the cached JS gets properly updated.
Also, since this is a bigger change it also qualifies for a version
increase :-)
2015-11-22 16:05:52 +01:00
Lukas Reschke
daa388ce8d
Move index.php from files to AppFramework
...
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
2015-11-16 21:10:11 +01:00
Lukas Reschke
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +01:00
Thomas Müller
adfb33b791
Merge pull request #19838 from owncloud/remove-files-remote.php
...
Remove apps/files/appinfo/remote.php - this is no longer used
2015-10-20 11:31:35 +02:00
Joas Schilling
0d3d75b3b3
Increase the 2nd digit of shipped apps
2015-10-17 08:47:11 +02:00
Thomas Müller
ef3fefc00e
Remove apps/files/appinfo/remote.php - this is no longer used
2015-10-16 16:49:51 +02:00
Thomas Müller
f2889dc6e4
Consolidate webdav code - move all to one app
2015-10-16 13:17:12 +02:00
Morris Jobke
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
Joas Schilling
5eddde6486
Add a Sabre plugin that emits an event for apps
2015-09-17 13:59:27 +02:00
Morris Jobke
e88b380973
Remove DEBUG constant and use config value
...
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
2015-08-24 15:14:05 +02:00
Thomas Müller
eb13cb8d75
Merge pull request #18127 from owncloud/dav-request-tests
...
add test framework for doing full request webdav tests
2015-08-12 10:07:20 +02:00
Robin Appelman
b0c8654f9e
split out creating the sabre dav server to it's own factory
2015-08-11 14:43:46 +02:00
Roeland Jago Douma
f0b617b508
Use DI
...
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
2015-08-10 10:45:16 +02:00
Roeland Jago Douma
e84cffc063
Moved core apps to the capabilities manager
...
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
2015-08-10 10:45:16 +02:00
Bjoern Schiessle
5923270004
add condition to update query
2015-07-27 12:08:13 +02:00
Joas Schilling
20cf8ec205
Add an update script to reset the value
...
In case encryption was not enabled, we accidently set encrypted = 1 for
files inside mount points, since 8.1.0. This breaks opening the files in
8.1.1 because we fixed the code that checks if a file is encrypted.
In order to fix the file, we need to reset the flag of the file. However,
the flag might be set because the file is in fact encrypted because it was
uploaded at a time where encryption was enabled.
So we can only do this when:
- Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
- Encryption is disabled
- files_encryption is not known in the app config
If the first two are not the case, we are save. However, if files_encryption
values exist in the config, we might have a false negative here.
Now if there is no file with unencrypted size greater 0, that means there are
no files that are still encrypted with "files_encryption" encryption. So we
can also safely reset the flag here.
If this is not the case, we go with "better save then sorry" and don't change
the flag but write a message to the ownCloud log file.
2015-07-24 10:37:39 +02:00
Roeland Jago Douma
a727cbc7a9
Remove ajax/mimeicon.php and its route
2015-07-09 13:40:13 +02:00
Thomas Müller
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Lukas Reschke
4b9e034968
Remove hard-dependency on disabled output_buffering
...
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.
However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.
Fixes https://github.com/owncloud/core/issues/16013
2015-05-04 14:15:15 +02:00
Lukas Reschke
4ea205e262
Block old legacy clients
...
This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance.
This has multiple reasons:
1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse
2. Old ownCloud client versions tend to be horrible buggy
In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client
2015-04-20 11:12:17 +02:00
Joas Schilling
3f3f8c2f99
Fix usage of deprecated private constants
2015-04-18 10:30:02 +02:00
Thomas Müller
02614d214e
Merge pull request #15437 from owncloud/deleteorphanedfiles
...
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
Morris Jobke
cefdcea021
[command] delete orphaned file cache entries
...
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
Joas Schilling
9233d32834
Move tag related code into a helper so we can test the query without a view
2015-03-30 17:21:06 +02:00
Joas Schilling
e365ea7ec5
Use DI for the objects where possible
2015-03-30 15:23:10 +02:00
Vincent Petry
7ad4dfa201
Merge pull request #15227 from owncloud/ocetag-header
...
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Morris Jobke
d3ed020d34
Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master
...
no php execution timeout for webdav
2015-03-26 20:18:01 +01:00
Vincent Petry
70acd58336
Copy Etag header to OC-Etag for sabre calls
2015-03-26 16:06:43 +01:00
Thomas Müller
f9525b153e
no php execution timeout for webdav
2015-03-26 11:55:26 +01:00
Jenkins for ownCloud
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
Roeland Jago Douma
0ea3878111
No longer directly output OC_Image for thumbnails
...
* Only use public interfaces
- Injected IPreview
* Added unit tests
2015-03-24 18:55:06 +01:00
Joas Schilling
9c45ab49a1
Use a closure for the files app entry and deprecate old methods
2015-03-17 12:17:09 +01:00
Thomas Müller
0f3e36fdfd
Adding a more meaningful message for sabre dav exception - fixes #14516
2015-03-11 11:53:31 +01:00
Morris Jobke
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
.
2015-02-26 11:37:37 +01:00
Thomas Müller
b3de86d851
Remove locks plugin.
...
Reasoning:
- a WebDAV server is not required to implement locking support
- WebDAV Locking is know to break the sync algorithm
- the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
2015-02-25 10:30:47 +01:00
Lukas Reschke
432d7be8cc
Show a empty response for GET on non-files instead of the Browser Plugin
2015-02-23 22:27:23 +01:00
Vincent Petry
9f6dcb9d3e
Sabre Update to 2.1
...
- VObject fixes for Sabre\VObject 3.3
- Remove VObject property workarounds
- Added prefetching for tags in sabre tags plugin
- Moved oc_properties logic to separate PropertyStorage backend (WIP)
- Fixed Sabre connector namespaces
- Improved files plugin to handle props on-demand
- Moved allowed props from server class to files plugin
- Fixed tags caching for files that are known to have no tags
(less queries)
- Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin
- Replace OC\Connector\Sabre\Request with direct call to
httpRequest->setUrl()
- Fix exception detection in DAV client when using Sabre\DAV\Client
- Added setETag() on Node instead of using the static FileSystem
- Also preload tags/props when depth is infinity
2015-02-23 22:27:23 +01:00
Jenkins for ownCloud
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
Joas Schilling
d20a8fae45
Move displaying of files related activities to files app
2015-02-13 13:37:10 +01:00
Joas Schilling
d6939d67da
Remove duplicated definition of APIController
2015-01-26 10:20:01 +01:00
Morris Jobke
39d6ddd38a
Merge pull request #12865 from owncloud/files-tags-webdav
...
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Vincent Petry
0b3f0716fc
Returns and update tags through WebDAV PROPFIND and PROPPATCH
...
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Morris Jobke
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
Lukas Reschke
be3d4fd303
Merge pull request #12360 from owncloud/files-tags
...
Add favorites to files app
2014-12-15 19:55:18 +01:00
Vincent Petry
207d77e5cd
Fixed small code style issues
2014-12-15 17:20:41 +01:00
Vincent Petry
a5bb66f4a7
Added favorites feature to the files app
2014-12-15 12:10:54 +01:00
Jörn Friedrich Dreyer
1d490b559c
introduce inApps[] filter for search via ajax query, make file results show up in files app only
...
use more flexible return type
check array with !empty instead of count
2014-12-10 15:51:59 +01:00
Lukas Reschke
8af346a84d
Don't show favicon to prevent iteration through subfolders
...
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 12:38:26 +01: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
Lukas Reschke
7956765c12
Match more URL fragments
...
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
2014-09-18 23:18:07 +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
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
Lukas Reschke
f9881abf25
Use proper routes for files
2014-08-19 15:19:18 +02:00
Morris Jobke
cad52dbce9
Kill filesync.php in files/appinfo
...
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
2014-08-13 15:58:43 +02:00
Thomas Müller
ea269f0067
Upload abortion is now detected within the OC_Connector_Sabre_File::put()
...
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless
Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
Vincent Petry
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
7af67eb630
increase version number of files and migration trigger
2014-06-06 12:28:36 +02:00
Jörn Friedrich Dreyer
a59b5249d3
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:00:25 +02:00
Jörn Friedrich Dreyer
2801f0f222
use non static access to search
2014-06-06 11:02:05 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Morris Jobke
9a67986473
add OCP\Config:deleteSystemValue
2014-06-02 18:31:43 +02:00
Morris Jobke
079b709f28
bump version
2014-06-02 16:47:15 +02:00
Morris Jobke
57ef089aac
drop allowZIPdownload and maxZIPSize as options
2014-06-02 16:29:03 +02:00
Vincent Petry
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
Vincent Petry
9d38e3602b
Namespacing for FileList, FileActions and trashbin app
...
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
"files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
Lukas Reschke
2d1296bb03
We do not support updates from 4.5 > 7.0
2014-05-13 18:54:43 +02:00
Robin Appelman
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
Robin Appelman
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
Thomas Müller
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
Robin Appelman
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
Thomas Müller
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
Robin Appelman
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
Thomas Müller
ae13ff112f
remove Sabre_DAV_Browser_Plugin
2014-03-12 00:10:16 +01:00
Robin Appelman
5ef37c28d1
Remove the need for a custom SabreDav server constructor
2014-03-04 13:28:48 +01:00
Robin Appelman
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
Robin Appelman
3a21755963
Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object
2014-02-25 16:23:09 +01:00
Jan-Christoph Borchardt
7330f61a94
Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
...
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
Thomas Müller
79fc4f3126
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
2014-02-06 11:34:27 +01:00
Vincent Petry
11ef12a106
Added exception logger plugin for sabre connector
...
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Jörn Friedrich Dreyer
9ae829497a
cleanup and actually execute the query
2013-11-01 15:45:33 +01:00
Jörn Friedrich Dreyer
72ca0a482b
use doctrine to construct concat expression
2013-11-01 15:40:21 +01:00
Jörn Friedrich Dreyer
51ec68a623
Concatenate string in SQL instead of PHP
2013-11-01 15:40:21 +01:00
Thomas Müller
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
Thomas Müller
ecfde5faa1
Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity
...
The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released.
This will and has to follow!
2013-09-30 13:12:51 +02:00
Thomas Müller
09b64535a9
fixing copyright and add class documentation
2013-09-25 17:05:14 +02:00
Thomas Müller
2a0c51a8bf
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
...
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
Jörn Friedrich Dreyer
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
Bart Visscher
666bbbe060
Use appinfo/register_command.php to add commands to the console command
2013-09-13 18:10:04 +02:00
Thomas Müller
0890a915b3
adding file templates for ods, odt and odp
2013-08-18 21:11:11 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Robin Appelman
d91104e120
actually register html template
2013-08-07 23:48:44 +02:00
Robin Appelman
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
Jörn Friedrich Dreyer
7242480049
use $defaults->getName() as webdav REALM
2013-07-23 18:14:05 +02:00
Robin Appelman
1e0810e807
use new ObjectTree in sabredav
2013-06-30 18:37:47 +02:00
Robin Appelman
e1b5598f00
Files: use public api to register backgroundjob
2013-06-02 21:21:39 +02:00
Robin Appelman
15dae6198f
Cache: add a backgroundjob to check for external changes to the filesystem
2013-04-20 16:38:03 +02:00
Jörn Friedrich Dreyer
606b672a3d
always connect file cache updater hooks first
2013-04-16 13:07:55 +02:00
Tom Needham
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
Robin Appelman
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
Tom Needham
f141f8b523
Add further capabilities to /cloud/capabilitites api call
2013-02-10 14:42:23 +01:00
Michael Gapczynski
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
Stefan Herbrechtsmeier
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
Jan-Christoph Borchardt
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
Robin Appelman
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
Robin Appelman
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
Robin Appelman
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
Lukas Reschke
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
Lukas Reschke
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
Robin Appelman
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Thomas Mueller
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
Bart Visscher
8aba5874db
Merge pull request #644 from butonic/checkstyle_fixes
...
fix checkstyle for files app
2012-11-30 04:10:31 -08:00
Robin Appelman
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
Jörn Friedrich Dreyer
3b83fe1530
fix checkstyle for files app
2012-11-29 18:33:15 +01:00
Robin Appelman
bcb27c81d4
use new obEnd function instead of ob_end_clean
2012-11-29 18:01:21 +01:00
Robin Appelman
03fd43a239
Merge branch 'master' into filesystem
2012-11-25 15:38:17 +01:00
Robin Appelman
eaf8399aaf
make sure the output buffer is closed when handeling webdav
2012-11-25 14:45:13 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
Arthur Schiwon
85d6a08ae9
prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups
2012-11-05 20:47:26 +01:00
Robin Appelman
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Jan-Christoph Borchardt
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
Robin Appelman
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
Björn Schießle
a9ce43de41
adapted comments to the code changes
2012-11-01 00:20:50 +01:00
Björn Schießle
3878950af4
load logging apps for webdav connections
...
Backport of de1b95c
2012-11-01 00:20:43 +01:00
Robin Appelman
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
Jan-Christoph Borchardt
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
Bart Visscher
ccbf4e993c
Use files remote webdav in compatibility files/webdav.php
2012-10-29 15:04:56 +01:00
Jan-Christoph Borchardt
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
Robin Appelman
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
Felix Moeller
6a00a6b9ed
Make Jenkins more happy.
...
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
Bart Visscher
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
Robin Appelman
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
Jörn Friedrich Dreyer
39735721ec
escape identifiers in queries
2012-10-02 14:11:25 +02:00