Vincent Petry
e4ed995727
Merge pull request #17605 from owncloud/pwebdav-stripmountinfo
...
Strip public webdav info about sharing and mount points
2015-07-13 17:21:40 +02:00
Morris Jobke
08faf1811b
Merge pull request #17609 from owncloud/core-js-helpersforcurrenturl
...
Add helper functions for host, port and webroot
2015-07-13 17:19:28 +02:00
Morris Jobke
533a23611a
Handle returned null value in app level code
...
* getApplication on OCSClient can also return null
this is now handled properly
* fixes #17587
2015-07-13 15:34:00 +02:00
Vincent Petry
b56a57e21c
Add helper functions for host, port and webroot
...
These should be used in the future instead of location.*.
It will make it possible to stub these methods for writing unit tests
and simulating different URL schemes.
2015-07-13 15:26:01 +02:00
Vincent Petry
b3b080e1c0
Strip public webdav info about sharing and mount points
...
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
Vincent Petry
1b7d42c569
Fix OC.joinPaths with empty arguments
...
When empty arguments are given, the leading or trailing slash was not
detected properly.
2015-07-13 10:57:52 +02:00
Morris Jobke
1006ec56ce
Merge pull request #17481 from rullzer/mimetype-list
...
Move mimetypes.list.php to config/mimetypemapping.dist.json
2015-07-13 08:31:18 +02:00
Jenkins for ownCloud
52e9c94e08
[tx-robot] updated from transifex
2015-07-13 01:54:50 -04:00
Jenkins for ownCloud
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
Morris Jobke
ee7ccc9c3d
Merge pull request #17559 from owncloud/js-joinpathsutility
...
Add OC.joinPaths for convenient path joining
2015-07-10 17:07:19 +02:00
Vincent Petry
fbc03b43b9
More tests for joinPaths
2015-07-10 15:31:58 +02:00
Roeland Jago Douma
8cac236135
Move to OC::$configDif
2015-07-10 15:15:50 +02:00
Vincent Petry
a7c7d394ec
Merge pull request #17555 from owncloud/update-test-libraries
...
Update JS unit test libs
2015-07-10 15:11:53 +02:00
Felix Böhm
c9917e4cd6
allow remote shares for users with email as usernames
2015-07-10 14:58:32 +02:00
Vincent Petry
119e27166e
Add OC.joinPaths for convenient path joining
2015-07-10 13:02:28 +02:00
Roeland Douma
4806d7597b
Merge pull request #17509 from rullzer/mimetype-alias-dist
...
Move mimetypealiases.json to mimetypealiases.dist.json
2015-07-10 11:44:09 +02:00
Vincent Petry
9d71542ee4
Update JS unit test libs
...
Update sinon to 1.15.4.
Update karma-jasmine to 0.3.0
Update jasmine to 2.3.4
This brings a bunch of new useful functions for unit testing.
2015-07-10 11:21:47 +02:00
Roeland Jago Douma
032ffc969e
Move mimetypealiases.json to mimetypealiases.dist.json
2015-07-10 10:17:49 +02:00
Vincent Petry
87f3500fda
Merge pull request #17483 from rullzer/migrate-mimetype-js
...
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
2015-07-10 10:14:03 +02:00
Jenkins for ownCloud
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
Morris Jobke
e3b4e4f0f3
Merge pull request #17546 from owncloud/forwardport-16917
...
Fix the config.php owner check for console.php
2015-07-10 02:34:58 +02:00
Morris Jobke
bceb38ce82
Merge pull request #17517 from RealRancor/fix_failed_login_syntax
...
Fixed "Remote IP:" syntax on failed logins
2015-07-10 02:34:09 +02:00
Philippe Le Brouster
12b751ddc9
Fix the config.php owner check for console.php
...
The config directory must be taken from OC::$configDir
Minor fix
- Remove uneeded slash in the configdir path.
2015-07-09 23:19:52 +02:00
Morris Jobke
c86e742e67
Merge pull request #15586 from Egari/addThemeSupportToMimeIcon
...
Add theme support to mimetypeIcon through imagePath integration
2015-07-09 23:02:46 +02:00
Morris Jobke
42eb18c747
Merge pull request #17473 from owncloud/enc_fix_migration
...
more secure way to update the database
2015-07-09 22:41:56 +02:00
Morris Jobke
28e4542b58
Merge pull request #17530 from owncloud/proper-config-for-singleuser-command
...
[command] single user mode - use config object & add tests
2015-07-09 22:20:02 +02:00
Roeland Jago Douma
eb7a796ad9
Fix unit tests
2015-07-09 18:42:46 +02:00
Morris Jobke
08afce3d7e
[command] single user mode - use config object & add tests
2015-07-09 18:33:46 +02:00
Morris Jobke
d52e197b0d
Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder
...
Add getUserFolder to IRootFolder
2015-07-09 14:29:47 +02:00
Roeland Jago Douma
eea56dc309
MimeTypes now also supports httpd/unix-directory
...
Since we both use dir and httpd/unix-directory in OC they should map to
the same icon.
Fixes #17527
2015-07-09 14:19:31 +02:00
Roeland Jago Douma
7d943b2ddc
Make the filelist get the mimetypeicon from the mimetype
2015-07-09 13:56:43 +02:00
Roeland Jago Douma
a727cbc7a9
Remove ajax/mimeicon.php and its route
2015-07-09 13:40:13 +02:00
Roeland Jago Douma
5c381ea532
Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl
2015-07-09 13:40:13 +02:00
Roeland Jago Douma
1aa2f6638f
Make getMimeIcon use OC.MimeType.getIconUrl
2015-07-09 13:40:12 +02:00
Thomas Müller
d3b58d147f
Allow upgrade of not enabled apps
2015-07-09 12:37:57 +02:00
Arthur Schiwon
bfdf39b9bd
LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516
2015-07-09 12:19:04 +02:00
RealRancor
e62c375749
Fixed "Remote IP:" syntax on failed logins
2015-07-09 10:04:51 +02:00
Morris Jobke
2b86ba43e3
Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype
...
No more leaking of mounttype via metadata or icon in public shares.
2015-07-09 09:41:27 +02:00
Jenkins for ownCloud
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
Hendrik Leppelsack
4d289dc590
fix browser compatibility issue for element.closest
2015-07-08 22:58:08 +02:00
Thomas Müller
201607332b
Merge pull request #17498 from owncloud/add-db-indexes
...
Add indexes to speedup DB queries
2015-07-08 20:41:17 +02:00
Bjoern Schiessle
1e284b15ff
only create new key pair if both keys are missing
2015-07-08 19:08:41 +02:00
Morris Jobke
19f34bafa5
Merge pull request #17472 from RealRancor/add_is_dir
...
Add is_dir check to getAllApps() function
2015-07-08 18:30:45 +02:00
Bjoern Schiessle
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +02:00
Morris Jobke
4a37d565bd
Add indexes to speedup DB queries
...
* file_target is often used in the sharing code in JOIN statements for retrieval of shares
2015-07-08 18:04:10 +02:00
Roeland Jago Douma
895d29adf1
Move mimetypemapping.json to mimetypemapping.dist.json
...
This allows users to create their own mapping file to extend our current
mappings. This makes sure that custom mappings are not lost on OC
upgrades.
2015-07-08 17:16:12 +02:00
Bjoern Schiessle
876d7c160d
more secure way to update the database
2015-07-08 13:26:53 +02:00
Roeland Jago Douma
35fba1ef9f
Move mimetypes.list.php to config/mimetypemapping.json
...
This allows users to add new mimetypemappings (extention -> mimetype)
themself. And not have to wait until a new release for updated
mimetypes.
Fixes : #15384
2015-07-08 13:18:58 +02:00
Bjoern Schiessle
db65eeb580
only move real files to the trash bin
2015-07-08 11:32:06 +02:00