0ed86c0993
Move OC_USER_BACKEND_* constants to OC_User_Backend class
2014-11-27 13:47:32 +01:00
24511c6f00
Move OC_GROUP_BACKEND_* constants to OC_Group_Backend class
2014-11-27 13:47:30 +01:00
a2172786a8
Merge pull request #12449 from owncloud/issue/12444-namespace-exceptions
...
Issue/12444 namespace exceptions
2014-11-27 12:14:06 +01:00
f52ba9c73c
Merge pull request #12418 from owncloud/delete_previews
...
delete old previews
2014-11-27 12:09:39 +01:00
4f1bbc4fd5
Remove unused 2nd parameter of buildPath() and rename to getSourcePath()
2014-11-27 11:19:20 +01:00
20237fba47
Introduce getSourcePath() in Storage\Local to reduce the difference to MappedLocal
2014-11-27 11:19:18 +01:00
a74822279c
Merge pull request #12464 from owncloud/cache-available-languages
...
Cache results of available languages
2014-11-27 11:12:18 +01:00
ea3780f911
Replace exception with standard exception
2014-11-27 11:10:05 +01:00
e1f3abf7a5
Correctly namespace and autoload DatabaseException
2014-11-27 11:10:04 +01:00
51190f711d
Merge pull request #12451 from owncloud/issue/6101-remove-gettype-class
...
Move constants from GET_TYPE to OC\Files so they can be autoloaded
2014-11-27 11:03:55 +01:00
b20d698ebd
Cache results of available languages
...
This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof
Surely, this is no gigantic gain but if we would do that for every function out there...
2014-11-27 00:01:55 +01:00
5097d4dc05
remove deprecated \OC:$session
2014-11-26 15:32:47 +01:00
8e28bf012c
Move constants from GET_TYPE to OC\Files so they can be autoloaded
2014-11-26 12:56:54 +01:00
3338eede3c
Correctly namespace DatabaseSetupException
2014-11-26 12:30:07 +01:00
c749570a06
Merge pull request #12411 from owncloud/unknown-command-windows
...
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
1da46b1a58
Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api
...
because OC_User::login will create a new session we shall only try to lo...
2014-11-26 10:22:16 +01:00
60e4aa120f
Merge pull request #12350 from mprokop/link_expiration
...
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
320a3c3784
because OC_User::login will create a new session we shall only try to login if user and pass are set
...
ensure to never destroy an existing session
2014-11-26 09:19:10 +01:00
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
e9696a8c9a
Merge pull request #12420 from owncloud/sqlite-wal-2
...
adding new config parameter for sqlite to specify the journal mode
2014-11-26 00:47:22 +01:00
0274dcba57
Replace some more "command -v" calls with the Helper method
2014-11-25 18:10:03 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
a6c088a1ef
adding new config parameter for sqlite to specify the journal mode
2014-11-25 16:29:06 +01:00
fc116f563f
Allow read-only configuration
...
Workaround required for IIS setups running ownCloud to prevent dataloss.
Long-term solution would be to move some configuration settings to the database
2014-11-25 16:26:47 +01:00
0f18274ca5
Merge pull request #12416 from owncloud/app-info-xml-parser-2
...
App info xml parser 2
2014-11-25 15:56:52 +01:00
1a1b459ae8
delete old previews
2014-11-25 15:42:02 +01:00
5ce34fbaf6
handle invalid xml file
2014-11-25 11:53:28 +01:00
d4f107d4dd
simplify xml parser code
2014-11-25 11:53:28 +01:00
c503ecd544
Introduce app info xml parser including basic unit test - necessary for #10777
2014-11-25 11:53:28 +01:00
93a6cc17a5
The class name is Movie NOT Movies
2014-11-25 11:35:38 +01:00
53b2d85709
Merge pull request #12402 from owncloud/fix-phpdoc
...
Fix PHPDoc and deprecated code
2014-11-25 09:20:36 +01:00
eb1dcb87c1
Merge pull request #12380 from owncloud/remove-oc-migrate
...
Remove OC_Migrate
2014-11-25 00:25:37 +01:00
b947b65e5b
Fix PHPDoc and deprecated code
...
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
2014-11-24 23:09:49 +01:00
e2a9bd7838
You can only change the oritentation of a JPEG
...
TIFFs also have EXIF headers, but they're not supported by the Image class
PHP doc
http://php.net/manual/en/function.exif-read-data.php
2014-11-24 17:32:53 +01:00
ddacd7f900
Merge pull request #12294 from owncloud/route-postfix
...
Add route postfix to allow url versioning when only the http method changed
2014-11-24 16:32:54 +01:00
168fce0b18
Merge pull request #12303 from owncloud/windows-unknown-command-command
...
Deduplicate findBinaryPath() and do not try "command -v" on windows
2014-11-24 14:03:07 +01:00
1b17429c1d
Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
...
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
8782b2237c
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
...
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
216d617938
Remove OC_Migrate
...
This is unused legacy code. Let it die with ~~~honor~~ fire.
Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
45d985f2d8
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
2014-11-23 19:11:03 +01:00
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
397f14ed86
Consolidate if statement, and update unit test
2014-11-21 13:31:56 +01:00
1d4d308a6c
fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.
2014-11-21 11:01:39 +01:00
593ef76e36
Revert "drop OC_Preferences::getUsers and getApps"
...
This reverts commit 09fd34eed9
2014-11-20 22:02:26 +01:00
09fd34eed9
drop OC_Preferences::getUsers and getApps
2014-11-20 17:56:05 +01:00
985f8c3f69
Merge pull request #12330 from owncloud/jenkins-eat-that
...
drop dependency of some commands on old config object
2014-11-20 17:11:08 +01:00
7fa4c6d0bc
Merge pull request #12321 from owncloud/checkForXMLWriter
...
Check for XMLWriter class
2014-11-20 17:04:27 +01:00
8ae8eb4734
drop dependency of some commands on old config object
2014-11-20 15:03:16 +01:00
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
46e6104795
Merge pull request #12297 from owncloud/issue/10991-all-testcase
...
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
9a1673c79d
Check for XMLWriter class
...
This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
2014-11-20 13:13:14 +01:00
6a08fca363
Merge pull request #12253 from owncloud/port-12154
...
Port 12154
2014-11-20 12:47:27 +01:00
d15f1882f9
Simplify the binary finding code in the movie preview class
2014-11-20 12:41:55 +01:00
64421d76fd
Deduplicate function by moving it to the OC_Helper
2014-11-20 12:37:59 +01:00
bb540722cd
Use base class to reset the file mapper
2014-11-19 14:52:07 +01:00
4e90c44301
add postfix
...
add postfix
2014-11-19 12:01:42 +01:00
d40bdfb35e
drop unneeded var_dump - fixes #9997
2014-11-18 22:36:42 +01:00
81d112fb42
Merge pull request #12261 from oparoz/patch-1
...
Replace deprecated switches
2014-11-18 18:59:34 +01:00
106d0f9c75
Merge pull request #12224 from owncloud/fix_12211
...
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 17:26:02 +01:00
cb118ce371
Replace deprecated switches
...
Warning: -convert-to is deprecated. Use --convert-to instead.
Warning: -outdir is deprecated. Use --outdir instead.
2014-11-18 15:04:01 +01:00
309788003d
Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager
...
Fix type hinting for app manager
2014-11-18 13:56:40 +01:00
8d4e63dd7c
Merge pull request #12242 from owncloud/fix-undefined-size
...
Check if the size field is available
2014-11-18 12:37:16 +01:00
260a084d27
Add repair steps for legacy config files
...
Remove all ports from the trusted domains
Conflicts:
lib/private/repair.php
lib/repair/repairconfig.php
2014-11-18 12:36:03 +01:00
d0a30b0e55
Ignore port for trusted domains
...
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)
Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.
Conflicts:
lib/private/request.php
2014-11-18 12:36:03 +01:00
0b630a37ab
Fix type hinting for app manager
2014-11-18 12:22:13 +01:00
ea4eedd35a
only users can have a display name different from the id
2014-11-18 11:46:28 +01:00
367468ff1f
make sure that we only find the shares from the correct share type if users and groups with the same ID exists
2014-11-18 11:11:49 +01:00
5192641447
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 11:03:08 +01:00
36ba935381
Merge pull request #12237 from owncloud/fix-12236
...
Make declaration compatible
2014-11-18 10:30:17 +01:00
944cd327b1
Merge pull request #9962 from owncloud/app-group-enable-remote
...
Fix remote.php routes for apps that are enabled for specific groups
2014-11-18 10:08:20 +01:00
6535540dcd
Check if the size field is available
...
In some cases the 'size' field is not available resulting in some PHP errors such as:
```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```
This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
2014-11-17 22:39:40 +01:00
e8f90133e0
Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse
...
Move CSRF check
2014-11-17 18:34:55 +01:00
0b9dffa828
Make declaration compatible
...
Fixes #12236
2014-11-17 18:30:17 +01:00
af7688ec17
Merge pull request #11741 from owncloud/delete_all_children_preview_2
...
delete all children's previews when deleting a folder
2014-11-17 16:45:54 +01:00
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
7cb12d4bff
Add sabredav plugin to check if a user has access to an app
2014-11-17 15:50:24 +01:00
36528c6ef6
Merge pull request #12031 from owncloud/app-manager
...
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-17 15:49:15 +01:00
07f0d76fc6
Move CSRF check
...
Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
2014-11-17 15:10:53 +01:00
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
0ab973a3a6
Make it possible to cleanPath() absolute Windows paths
2014-11-17 10:48:15 +01:00
39ae569c5c
Correctly close handle of directory when listing certificates
2014-11-17 10:48:14 +01:00
b9e86b0951
Merge pull request #12186 from owncloud/fix-12182
...
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-15 16:50:15 +01:00
cd5925036a
Check if app is enabled for user
...
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
2014-11-15 11:13:55 +01:00
74ffda8261
do not output DB information, and do not set header
2014-11-14 17:43:22 +01:00
08205c63f9
errors are already logged
2014-11-14 16:59:54 +01:00
7ed678b04d
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-14 15:48:55 +01:00
c0d63680ed
Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup
...
cleanup group admin(s) on deleteGroup
2014-11-13 22:39:40 +01:00
e5d46d0d94
Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name
...
removal of wrong/double implemented check
2014-11-13 15:39:07 +01:00
7e70c4ee95
removal of wrong/double implemented check
...
Check already implemented in core/settings/ajax/changedisplayname.php
2014-11-13 13:02:02 +01:00
5f8fb8d1ee
Run preupdate before an update
...
The update routine tries to test the database migration before actually performing the update.
However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.
This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
2014-11-13 12:07:49 +01:00
97a8fa418d
Merge pull request #12141 from owncloud/kill-dav-client
...
OC_DAVClient is not longer used - no need to carry it around anymore
2014-11-12 21:20:52 +01:00
4302a78b27
Deprecate older API wrappers and calls
...
Those old classes have now non-static pendants and can be deprecated IMHO.
2014-11-12 17:39:25 +01:00
6e3a841652
Merge pull request #12139 from owncloud/DoNotTouchMe
...
Try to read the file only instead of trying to touch
2014-11-12 17:29:56 +01:00
fede6b93e5
OC_DAVClient is not longer used - no need to carry it around anymore
2014-11-12 17:07:34 +01:00
d5796bbaf9
Merge pull request #12128 from owncloud/drop-formfactor
...
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 16:23:19 +01:00
49ddaf9489
Try to read the file only instead of trying to touch
...
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.
Fixes https://github.com/owncloud/core/issues/12135
2014-11-12 15:57:19 +01:00
952abdc51a
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 13:07:23 +01:00
da31177a8f
Remove debug statement
...
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
2014-11-12 11:32:48 +01:00
c998f620d0
Merge pull request #12105 from owncloud/dav-fixcleanpath
...
Fix root path handling for WebDAV ext storage
2014-11-12 09:16:55 +01:00
9aef0421cf
Merge pull request #12107 from owncloud/dav-propfindmimetype
...
Return real mime type on PROPFIND
2014-11-12 09:16:26 +01:00
6d5a239abf
Fix Pimple unset
2014-11-11 22:04:46 +01:00
0b2c24081f
Return real mime type on PROPFIND
...
Return the real (insecure) mime type on PROPFIND
2014-11-11 15:42:50 +01:00
4b943a4810
Fix root path handling for WebDAV ext storage
...
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
2014-11-11 15:20:36 +01:00
43eb375ace
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-10 13:52:52 +01:00
9b99c1d6f0
Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry
...
Convert StorageNotAvailableException to SabreDAV exception
2014-11-10 12:52:52 +01:00
676b911b22
Merge pull request #12027 from owncloud/cleanup_exceptions
...
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
cccedf6f30
Convert StorageNotAvailableException to SabreDAV exception
...
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.
This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
2014-11-10 12:01:24 +01:00
541344d880
logging changes
2014-11-07 12:45:42 -05:00
f27b6b0ab8
don't scan part files
2014-11-07 15:20:51 +01:00
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
d26a427f92
Also propagate etag changes when the watcher finds a changed file
2014-11-07 12:56:09 +01:00
e345697cab
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
...
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
88c329b394
Merge pull request #12019 from owncloud/fix-template-shortcuts
...
second parameter in template shortcuts script() and style() is optional
2014-11-07 11:01:10 +01:00
d383c45c13
Merge pull request #12003 from owncloud/password-migration
...
Use new hashing API for OC_User_Database
2014-11-06 22:43:57 +01:00
81e6329c04
second parameter in template shortcuts script() and style() is optional
2014-11-06 21:26:50 +01:00
e53354bfd7
Merge pull request #12009 from owncloud/make-optional
...
Make second argument optional
2014-11-06 19:43:11 +01:00
0c230fb57e
Merge pull request #11945 from owncloud/share-setup-other-user
...
Setup shared mounts for the correct user when setting up the filesystem
2014-11-06 19:24:24 +01:00
c21d1da01a
Support displaynames for dummy user backend
2014-11-06 18:31:40 +01:00
20cd9a134f
Make second argument optional
...
Equivalent to addVendorScript und addScript from OC_Util
2014-11-06 18:17:21 +01:00
c4d7483a0a
Use new hashing API for OC_User_Database
...
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
2014-11-06 15:42:06 +01:00
24ca2d858f
Add OCP\Security\IHasher
...
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
f73d653036
Merge pull request #11972 from owncloud/usermanager-remove-delete
...
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
1eefc21329
Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead
2014-11-05 15:45:58 +01:00
06267fec8f
Merge pull request #11928 from owncloud/support-HTML-in-logo
...
Support HTML in logo
2014-11-05 13:54:29 +01:00
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
7f4e447a5f
fix shortcuts - underline instead of camelCase
2014-11-04 13:57:38 +01:00
fde8ef0655
Merge pull request #11916 from owncloud/introduce-bower
...
Introduce bower dependency managment for frontend libraries
2014-11-04 11:59:33 +01:00
7f1d974796
Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig
...
First check whether it is the default config before touching
2014-11-03 21:20:42 +01:00
be5ae6c44f
Support HTML in logo claim
2014-11-03 21:14:27 +01:00
d763b32048
ability to add bower resources
...
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
2014-11-03 20:54:40 +01:00
994768d99f
Update Pimple to V3.0
2014-11-03 16:57:16 +01:00
9790801268
First check whether it is the default config before touchign
...
Potentially fixes https://github.com/owncloud/core/issues/11678
2014-11-03 16:37:04 +01:00
56cf1d9d27
fix odd behaviour
2014-10-31 18:46:47 +01:00
fd4b97d758
Merge pull request #9044 from owncloud/add-missing-email-principal
...
adding missing email address for principal
2014-10-31 13:24:42 +01:00
55658e7bb2
Merge pull request #11539 from owncloud/mount-setup-once
...
Only mount the storages for the user once
2014-10-31 10:42:29 +01:00
1c7f1a8787
Merge pull request #11877 from owncloud/fix-11875-master
...
prevent PHP notice
2014-10-30 21:43:38 +01:00
bed81ea854
Merge pull request #11080 from owncloud/addheader-text-2
...
Fix the addHeader tag attributes text methods to not ignore the text parameter
2014-10-30 18:13:46 +01:00
99921489cf
prevent PHP notice
2014-10-30 17:24:25 +01:00
33186957c8
delete all children's previews when deleting a folder
...
add phpdoc
2014-10-30 17:15:42 +01:00
9b293537a6
Merge pull request #11740 from owncloud/update-archive-tar
...
Update pear/archive_tar to 1.3.13
2014-10-30 17:14:07 +01:00
6db69c5d05
Merge pull request #11864 from owncloud/clear-session-after-logout
...
Clear session after logout
2014-10-30 16:47:46 +01:00
90e523ead0
Merge pull request #11858 from owncloud/fix-11064
...
Allow any outgoing XHR connections
2014-10-30 16:19:39 +01:00
08b46ccc17
Update pear/archive_tar to 1.3.13
2014-10-30 16:10:00 +01:00
18f7f582ac
Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro
...
Fix stupid copy paste fail
2014-10-30 14:45:58 +01:00
e2001c6d31
Merge pull request #11821 from owncloud/generic-response
...
Add a generic data response
2014-10-30 14:05:25 +01:00
770c62c5d8
Clear session after logout
...
Fixes https://github.com/owncloud/core/issues/8420
2014-10-30 12:10:39 +01:00
e219d72619
Fix stupid copy paste fail
...
...
2014-10-30 10:37:59 +01:00
b3f881748d
Allow any outgoing XHR connections
...
Quickfix for https://github.com/owncloud/core/issues/11064
2014-10-30 00:00:40 +01:00
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
fb4f993336
Fix implementation of translation short cut
2014-10-29 10:58:10 +01:00
c682b1f0c1
Fix language file detection
2014-10-29 10:13:51 +01:00
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
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
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
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
2974d4d380
Reset the users setup after clearing mounts
2014-10-28 15:13:29 +01:00
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
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
d6380a5395
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
...
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
79778d6a51
code cleanup during review 👍
2014-10-27 21:39:35 +01:00
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
3f63f4b6b1
Only mount the storages for the user once
2014-10-27 18:50:28 +01:00
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
a00712aa65
Merge pull request #11783 from owncloud/allow_passing_driver_options
...
allow passing db driver options
2014-10-27 16:00:13 +01:00
8de287f2ef
Merge pull request #11763 from owncloud/stable-etags
...
Generate stable etags for local files
2014-10-27 15:30:30 +01:00
e16a58220d
allow passing driver options, fixes #11718
2014-10-27 12:30:29 +01:00
aee1edf6b5
Merge pull request #11708 from owncloud/fix-momentjs
...
Setting moment locale based on user selection
2014-10-27 10:30:47 +01:00
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
be32e562e3
drop unneeded hint
2014-10-25 12:00:56 +02:00
63f2b1f460
Merge pull request #11767 from danbartram/add_db_rollback
...
Add missing DB rollback functionality
2014-10-24 19:52:56 +02:00
9fa5483111
Merge pull request #11709 from owncloud/temp-handling
...
Cleanup handling of temporary files
2014-10-24 19:29:05 +02:00
9c1015b790
Add missing DB rollback functionality
2014-10-24 17:44:06 +01:00
283c10f010
Generate stable etags for local files
2014-10-24 16:47:58 +02:00
f901c5ff08
Fix PHPDoc and remove explicit type hint
2014-10-24 15:49:55 +02:00
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
16cfca6a5f
Better reuse of cache data for getFolderContents
2014-10-24 12:33:54 +02:00
0a3f57f832
Pass the cached data to the filesystem watcher
2014-10-24 12:32:55 +02:00
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
0b96297783
Use the TempManager to handle temporary files
2014-10-24 12:18:49 +02:00
83c74b80ad
Add \OC\TempManager to handle creating and cleaning temporary files
2014-10-24 12:18:46 +02:00
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
cbd130bed0
adding missing email address for principal
...
* fix #8515
* add mail only if it exists
2014-10-24 11:12:23 +02:00
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
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
c30b7f8197
Remove unreachable statement
2014-10-23 23:03:14 +02:00
ca5abe5744
Setting moment locale based on user selection
2014-10-23 10:32:47 -04:00
e26a16afea
Merge pull request #11549 from owncloud/add-more-localizations-master
...
implement localizations based on punic
2014-10-23 16:09:47 +02:00
6c1871da06
Merge pull request #10985 from owncloud/db-cleanup
...
Cleanup database handling
2014-10-23 13:48:33 +02:00
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
e9ec45ddd1
Merge pull request #11704 from owncloud/fix-type-for-query
...
Use mixed as type
2014-10-22 18:13:31 +02:00
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
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
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
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
993376fb6f
better variable name
2014-10-22 13:36:57 +02:00
e0342db47c
set up FS by username, not login name\!
2014-10-22 13:28:08 +02:00
02c5933af8
introduce SessionMiddleWare to control session handling via an annotation
2014-10-22 12:44:19 +02:00
d83b11d34a
Use statements wrapper in \OCP\IDB
2014-10-22 12:29:53 +02:00
e6f6cdd19f
Bit more cleanup
2014-10-22 12:29:53 +02:00
2ae6a0d96d
Move creating the database connection to the server container
2014-10-22 12:29:53 +02:00
Joas Schilling
Morris Jobke
Vincent Petry
Lukas Reschke
Thomas Müller
Georg Ehrke
Olivier Paroz
Olivier Paroz
Bjoern Schiessle
Miguel Prokop
Bernhard Posselt
Björn Schießle
Robin Appelman
Robin Appelman
Arthur Schiwon
michag86
Jan-Christoph Borchardt
Bernhard Posselt
Craig Morrissey
Jörn Friedrich Dreyer
Dan Bartram
libasys
kondou
Clark Tomlinson