Commit Graph

9306 Commits

Author SHA1 Message Date
Sam Tuke a528f96b84 Merge branch 'master' into files_encryption-style-fixes 2013-02-05 18:23:03 +00:00
Sam Tuke 927d4c98a1 Fixed todos: undefined vars and unreachable code 2013-02-05 13:12:34 +00:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Müller 6e5f211ad1 Merge pull request #1449 from owncloud/fixing-namespace-local-storage-master
fixing namespace in local storage
2013-02-04 12:52:56 -08:00
Thomas Tanghus 68fe6d0077 Merge pull request #1432 from owncloud/add_requesttoken
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
Thomas Tanghus 951afcf327 Merge pull request #1442 from owncloud/reuse-oc_helper-tmpfolder-master
reuse \OC_Helper::tmpFolder()
2013-02-04 11:57:57 -08:00
Thomas Müller 3b8c071df4 Merge pull request #1234 from owncloud/fix-issue-192
Fix sharing issue with collection and children mismatches
2013-02-04 11:52:20 -08:00
Thomas Mueller 02e6adfdb3 fixing namespace 2013-02-04 20:49:01 +01:00
Thomas Müller a7e62b0366 Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
in case file based session handling in enabled - we need to make sure th...
2013-02-04 11:11:15 -08:00
Thomas Müller f04a91bd60 Merge pull request #1445 from owncloud/CSP_font
Allow loading of external fonts
2013-02-04 10:36:43 -08:00
Lukas Reschke 5fcb35efd6 Also allow local files 2013-02-04 18:43:26 +01:00
Lukas Reschke bb90b0ee6e Allow the loading of local font files embedded via data: 2013-02-04 18:38:16 +01:00
Lukas Reschke 8de0f96a24 Allow loading of external fonts
Required by several applications like our pdf viewer
2013-02-04 17:51:52 +01:00
Thomas Müller 301afac291 Merge pull request #1427 from TheSFReader/master
The mimetype/mimepart need to be readable, even from searchByMime
2013-02-04 06:44:40 -08:00
Thomas Mueller 0a113600f7 in case file based session handling in enabled - we need to make sure the configured folder is writable 2013-02-04 15:32:01 +01:00
Thomas Müller 814369e0cd Merge pull request #1436 from owncloud/cache_check_path
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-04 05:51:34 -08:00
Thomas Mueller 997259df4b reuse \OC_Helper::tmpFolder() 2013-02-04 14:11:51 +01:00
Robin Appelman 7c33d0a5a7 Cache: fix copy-paste errors 2013-02-04 13:28:31 +01:00
Thomas Müller f7258cc5e8 Merge pull request #1423 from owncloud/getowner
Add getOwner to Filesystem and View classes
2013-02-04 03:08:13 -08:00
Björn Schießle fee3f80501 Merge pull request #1434 from owncloud/trashbin_CSRF
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
Lukas Reschke 8add89ced1 OCP\JSON instead of OCP\User 2013-02-04 09:15:11 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Müller 5ceddabaa6 Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
Michael Gapczynski 95fd2d8d1e Merge pull request #1435 from owncloud/make_BlacklistConfigurable
Make file blacklist configurable
2013-02-03 19:05:31 -08:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Robin Appelman 80dd8d7802 Cache: check for invalid paths in getFileInfo/getDirectoryContent 2013-02-03 23:34:27 +01:00
Lukas Reschke 3def7f8187 Make fileblacklist configurable 2013-02-03 23:03:06 +01:00
Lukas Reschke 018c5f69c0 [files_trashbin] Add CSRF token 2013-02-03 22:49:12 +01:00
TheSFReader bc886ac496 Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-02-03 21:26:20 +01:00
Lukas Reschke bce59c3945 [user_webdavauth] add requesttoken 2013-02-03 19:58:55 +01:00
Jan-Christoph Borchardt b8e6b8692b fix CSS to coding guideline 2013-02-03 12:24:24 +01:00
raghunayyar 3bcf3c91e1 Password Toggle Support for Login 2013-02-03 11:56:00 +01:00
TheSFReader d03155a8d5 translate the mimtype/mimepart to readable in the searchByMime function 2013-02-03 11:06:26 +01:00
Thomas Müller a3b922763e Merge pull request #1416 from herbrechtsmeier/set_include_path_early
initPaths: set include path before any owncloud function is called
2013-02-03 00:25:21 -08:00
Thomas Müller 743c330f03 Merge pull request #1422 from TheSFReader/master
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
Michael Gapczynski 6093d961a0 Add getOwner to Filesystem and View classes 2013-02-02 18:50:40 -05:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
TheSFReader 42d59d5a16 Remove a warning by making sure the renamed file is a dir before trying and opening it 2013-02-02 23:18:29 +01:00
Thomas Müller 561e6c4c5b Merge pull request #1419 from owncloud/etag_fix
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 12:06:48 -08:00
Robin Appelman ed4130474a Dav: update etag in filecache when doing a PROPSET 2013-02-02 18:26:27 +01:00
Robin Appelman c61c98cbef Dav: don't overwrite etag from filecache with old etag from properties table 2013-02-02 15:44:05 +01:00
herbrechtsmeier 37e6ac9a2a initPaths: set include path before any owncloud function is called
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.

This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
2013-02-02 12:07:18 +01:00
TheSFReader 7e3aa0de86 Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-02-02 09:44:09 +01:00
Lukas Reschke 23166aa016 Merge pull request #1415 from owncloud/ldap_fix_settings
LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
2013-02-01 16:35:55 -08:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
Arthur Schiwon 10ad5f923a remove ugly whitespace 2013-02-01 23:52:41 +01:00
Arthur Schiwon a7d82ad0ee LDAP: settings Advanced tab has grown too long by far. Structure it using accordion 2013-02-01 23:48:22 +01:00
TheSFReader d8f6595c5e Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-02-01 23:28:20 +01:00
TheSFReader 469b1e8dd2 Correct it 2013-02-01 20:29:02 +01:00
Frank Karlitschek 03c18a6186 Merge pull request #1413 from owncloud/enable_removing_search_providers
add function to remove a search provider
2013-02-01 10:34:39 -08:00