69f5f6649e
Trim port from domain
...
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)
To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
2014-12-03 19:59:50 +01:00
2eb81ff78f
Merge pull request #12581 from owncloud/fix_typo
...
fix typo in license header
2014-12-03 19:55:07 +01:00
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
3d9c72d2d9
Merge pull request #12544 from owncloud/fix-windows-unittests
...
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
2014-12-03 17:49:10 +01:00
c90c9eb3e8
Merge pull request #12579 from owncloud/drop-files-external-tests
...
drop files_external tests from autotest - they will be executed with aut...
2014-12-03 17:44:56 +01:00
060cee223a
Merge pull request #12542 from owncloud/update-autotestcmd
...
Update autotest.cmd
2014-12-03 17:40:28 +01:00
80b15b48c5
Merge pull request #12492 from owncloud/deprecate-passwordsalt
...
Officially deprecate passwordsalt
2014-12-03 16:51:06 +01:00
e014a18b4a
drop files_external tests from autotest - they will be executed with autotest-external.sh which is coming
2014-12-03 16:38:25 +01:00
3fdb1937a3
Merge pull request #12382 from owncloud/enc_reorganize_folders2
...
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
e91dddd1a0
Merge pull request #12552 from szlwzl/master
...
adding @ sign between email address and domain name to make syntax clearer
2014-12-03 16:02:35 +01:00
726626b439
Officially deprecated passwordsalt
...
Hopefully this prevents people from using it in the future.
2014-12-03 15:02:33 +01:00
8700ffe698
Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood
...
Stop flooding the log, when previews are disabled
2014-12-03 14:51:03 +01:00
7291b915b8
Merge pull request #12553 from owncloud/default-iosid
...
add missing public interface for iOS client app id
2014-12-03 14:05:27 +01:00
6daa588e1c
Merge pull request #12556 from owncloud/add-route-for-versions
...
Add route for download of versions
2014-12-03 14:01:58 +01:00
69a5a0c1a0
Stop flooding the log, when previews are disabled
2014-12-03 12:52:42 +01:00
7dcf0b02aa
Merge pull request #12563 from owncloud/usermenu-remove-border
...
remove border from user menu, adjust to apps menu
2014-12-03 12:11:21 +01:00
ea4c25609d
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
2014-12-03 12:10:55 +01:00
2303b09548
Merge pull request #12565 from owncloud/config-sample-databases
...
add proper description what database is supported by CE and EE
2014-12-03 10:16:45 +01:00
8c8c257ce3
Merge pull request #12554 from owncloud/versions-app-autoload
...
Autoload lib files of versions app
2014-12-03 09:34:57 +01:00
98b28c68a3
add proper description what database is supported by CE and EE
2014-12-03 08:52:59 +01:00
af50df8912
[tx-robot] updated from transifex
2014-12-03 01:54:32 -05:00
2bbb11fb63
Merge pull request #10881 from owncloud/touch-statcache
...
Clear statcache before getting the mtime from local storage backends
2014-12-02 23:29:24 +01:00
5990293331
Improve the bitmap and vector mime icons
...
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
2014-12-02 21:11:56 +01:00
c4e0c02526
Add route for download of versions
...
Otherwise on master it was not possible anymore to download older versions.
Fixes itself.
2014-12-02 17:52:31 +01:00
f9958153ef
Merge pull request #12333 from owncloud/delete-selected-files
...
Fix deleting non deletable files by selecting them
2014-12-02 17:32:04 +01:00
1bd018a70c
Autoload exception from files_trashbin
2014-12-02 17:26:42 +01:00
694003d147
Autoload lib files of versions app
2014-12-02 17:21:19 +01:00
1bbb18fe87
also clear statcache in mapped local
2014-12-02 16:39:03 +01:00
a16d1a85ef
Merge pull request #11975 from owncloud/Combustible-combustible_dev
...
Check imagecreate*() return before using and use logger in \OC_Image
2014-12-02 16:18:00 +01:00
5b3dbb4ef8
add missing public interface for iOS client app id
2014-12-02 16:10:07 +01:00
9ca9acf3f8
small fixes
2014-12-02 16:08:06 +01:00
6d04ca18d9
adding @ sign between email address and domain name to make the syntax clearer
2014-12-02 15:06:40 +00:00
2e78217f17
delete old keys if file was moved to a different mount point
2014-12-02 16:03:54 +01:00
49cfc30359
upgrade to new folder structure
2014-12-02 16:03:54 +01:00
db3f7238dd
Clear statcache before getting the mtime from local storage backends
2014-12-02 14:25:49 +01:00
9da4a6323d
Restore the development config after running the tests
2014-12-02 12:41:33 +01:00
a0fea16d56
Allow overwriting DATADIR completly so ramdisk can be used
2014-12-02 12:21:37 +01:00
a73023fe05
Allow passing a test file just like in autotest.sh
2014-12-02 12:20:07 +01:00
7e47a363ff
Better manage the output when running autotest.cmd
2014-12-02 12:19:17 +01:00
e9029f94cb
Merge pull request #12310 from kampka/master
...
Implement a logger to log to error_log
2014-12-02 09:19:12 +01:00
553ce946d3
Implement a logger to log to error_log
2014-12-01 21:20:57 +01:00
0769556989
Merge pull request #12419 from owncloud/read-only-config
...
Allow read-only configuration
2014-12-01 16:37:29 +01:00
b2175f0e25
Use \OCP\ILogger
2014-12-01 16:21:54 +01:00
fa9b36b726
Added error check to lib/private/image.php
...
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.
Signed-off-by: Byron Marohn <combustible@live.com>
2014-12-01 16:20:17 +01:00
805be635fa
Only store user credentials when SMB_OC storage is enabled
...
Conflicts:
apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
8db4dd7585
Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped
...
Issue/12460 port local changes2mapped
2014-12-01 10:42:39 +01:00
48f00df08e
move jstz to bower management
2014-12-01 10:40:31 +01:00
fefeb506b2
include lock files of bower to be able to use "bower install"
2014-12-01 10:30:15 +01:00
ffd1fc42e7
Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions
...
Depcrate namespaced functions, since they can not be autoloaded
2014-12-01 09:38:15 +01:00
5275daff4e
[tx-robot] updated from transifex
2014-12-01 01:54:26 -05:00
Lukas Reschke
Thomas Müller
Bjoern Schiessle
Joas Schilling
Morris Jobke
Volkan Gezer
Vincent Petry
Jenkins for ownCloud
Robin Appelman
Olivier Paroz
Robin Appelman
Simon Whittaker
Christian Kampka
Byron Marohn