Commit Graph

18905 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 1374ba9adf fix fallback config for default home storage 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer f1bf1326b1 require updated 3rdparty with rackspace libs 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer ccb698a6a8 move swift and abstract code to core 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 85ccfad37c change 'object_storage' config param to 'root_storage'
copy skeleton only for local filesystems
2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer 2bf7e5c02f make objectstore setup more robust, don't pass user to object store mounted as root 2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer 3c66a8c8ed allow configuring objectstore as home and root storage 2014-06-18 12:53:19 +02:00
Bjoern Schiessle a921ad8925 fix rename of encryption keys 2014-06-18 12:19:33 +02:00
Jenkins for ownCloud baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Lukas Reschke d4bdcb7a9b Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
Load fundamental apps, before any possible customizing app may follow
2014-06-18 07:29:04 +02:00
icewind1991 8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Vincent Petry cce58368ad Merge pull request #9065 from owncloud/migrator-keepprimaryindexname
Do not rename primary key index when renaming table
2014-06-17 16:43:33 +02:00
Vincent Petry c5e33f5172 Merge pull request #9067 from owncloud/pass-db-hostname
Obviously have to pass the hostname as is when there is no ':' in the hostname
2014-06-17 15:56:52 +02:00
Björn Schießle a548de3611 Merge pull request #9029 from owncloud/table-to-paragraph-layout-for-share
Migrate table layout to p layout for share settings
2014-06-17 15:46:24 +02:00
Vincent Petry ffdc1c2fcf Added unit test for checkMigrate with primary key + autoinc
Added unit test to make sure that checkMigrate() works when adding a
primary key and autoincrement column to a table schema.
2014-06-17 15:23:18 +02:00
Vincent Petry 7aa11b4361 Do not rename primary key index when renaming table
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
2014-06-17 15:23:18 +02:00
Andreas Fischer 9db0a82a26 We obviously have to pass the hostname as is when there is no ':' in the hostname.
This reverts commit 73062040e6.
2014-06-17 14:48:32 +02:00
Morris Jobke 9e74787c8a Migrate table layout to p layout for share settings
ref #8906
2014-06-17 14:33:14 +02:00
Robin Appelman 07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Robin Appelman 2219087df6 organize js a bit better 2014-06-17 13:47:36 +02:00
Robin Appelman f2ebac5c76 Better error handeling in testremote 2014-06-17 13:15:34 +02:00
Robin Appelman 361607c72d testremote is for public access 2014-06-17 13:08:24 +02:00
Morris Jobke e7365c9507 fix broken buttons for IE8-11 2014-06-17 11:45:55 +02:00
Morris Jobke 17685adb87 fixing layout issue - mostly alignment 2014-06-17 11:24:39 +02:00
Jenkins for ownCloud ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Volkan Gezer dd2dd7eaae Merge pull request #9059 from owncloud/simplify-warning-layout
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
Lukas Reschke bd4f3849a3 That file was accidentally commited. Partially revert f2fc214ce0 2014-06-16 20:38:21 +02:00
Lukas Reschke f2fc214ce0 Add deprecation notice to load* functions
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Port of https://github.com/owncloud/core/pull/9033
2014-06-16 20:33:04 +02:00
Morris Jobke a5f1846170 simplify security warning on admin page 2014-06-16 20:25:02 +02:00
Morris Jobke c42d087fc5 Merge pull request #9053 from owncloud/small_ux_improvement
share settings, small ux improvement
2014-06-16 20:18:51 +02:00
Morris Jobke 99467898e1 Merge pull request #9055 from owncloud/add_new_keynote_mimetype
add new keynote mimetype
2014-06-16 20:13:35 +02:00
Volkan Gezer 08c8ae699f Merge pull request #9049 from owncloud/fix-upload-button
fix CSS for upload button - fixes #8939
2014-06-16 18:23:55 +02:00
Jörn Friedrich Dreyer cd77f92f4c add new keynote mimetype 2014-06-16 16:25:12 +02:00
Robin Appelman b188550c22 Also support removeable mounts with rmdir 2014-06-16 16:24:42 +02:00
Robin Appelman 0532f5c39a Fix permission for movable storage root 2014-06-16 16:20:40 +02:00
Robin Appelman 3ed4e5b26b Prevent warning 2014-06-16 16:12:32 +02:00
Robin Appelman 9c2918a626 Fix setupFromToken when a password is set 2014-06-16 16:09:56 +02:00
Robin Appelman 0616eb4007 Fix multiple users having the same external share mountpoint 2014-06-16 15:57:01 +02:00
Georg Ehrke 15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Bjoern Schiessle c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Morris Jobke b67588d35c Merge pull request #9048 from owncloud/fix_9041
format group or username for delete notification, fixes #9041
2014-06-16 15:23:08 +02:00
Morris Jobke b75fe439e7 fix CSS for upload button - fixes #8939 2014-06-16 13:51:49 +02:00
Georg Ehrke 86f546ff64 disable code check for shipped apps 2014-06-16 13:49:02 +02:00
Arthur Schiwon f12c4f6d11 style 2014-06-16 13:46:31 +02:00
Arthur Schiwon 3ebb1565a7 escape before output, fixes #9041 2014-06-16 13:44:41 +02:00
Robin Appelman 5b1b6572f7 Make testremote more robust 2014-06-16 13:21:00 +02:00
Robin Appelman 6e06e1da0e Add route which went missing during rebase 2014-06-16 13:20:39 +02:00
Morris Jobke 4fbab3c12d Merge pull request #9040 from owncloud/fix-xss
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Arthur Schiwon 7b704eeb5e Load fundamental apps, before any possible customizing app may follow 2014-06-16 13:12:21 +02:00
Morris Jobke 3069091e61 Merge pull request #9030 from owncloud/default-allow-user-mount-backends
AllowUserMount defaults now to all backends fixes #7958
2014-06-16 13:10:01 +02:00
Robin Appelman a469efb1f1 Add some safety checks 2014-06-16 12:42:28 +02:00