Commit Graph

19304 Commits

Author SHA1 Message Date
Joas Schilling 5d3e1bc023 Only calculate the WEBROOT from scriptName if it contains $SUBURI
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.

Fix #9490
2014-07-07 15:08:46 +02:00
Joas Schilling e8537afd60 Only overwrite serverHost when in unit tests
The intention of the original commit 12f7cb8767
was to fix tests. But cron should always return a valid host not localhost.
2014-07-07 15:08:45 +02:00
Jenkins for ownCloud 6e9905d7cf [tx-robot] updated from transifex 2014-07-07 01:54:28 -04:00
Morris Jobke d3e65bc974 Merge pull request #9469 from owncloud/replace_uninstall_button_with_link
improvements for uninstall button
2014-07-06 23:56:44 +02:00
Morris Jobke 694bcc6813 Revert "fix version number - @karlitschek ;)"
This reverts commit f1b3e03f7f.
2014-07-06 23:52:32 +02:00
Frank Karlitschek a468687682 Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
[encryption] always take unencrypted size
2014-07-06 10:38:06 -04:00
Volkan Gezer 1f29bd18e9 Merge pull request #9466 from owncloud/design-fix-fieldset-legend
fix fieldset look, fix #8158
2014-07-06 15:58:06 +02:00
Jenkins for ownCloud 33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04:00
Georg Ehrke 485be909ff improvements for uninstall button 2014-07-05 13:39:25 +02:00
Jan-Christoph Borchardt 3e5113d053 fix fieldset look, fix #8158 2014-07-05 10:06:26 +02:00
Jan-Christoph Borchardt a6fb8c16e6 Merge pull request #9446 from owncloud/fix-strengthify
also make strengthify transparent on setup submit - fixes #9436
2014-07-05 09:50:51 +02:00
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Jörn Friedrich Dreyer 8fbcca1291 Merge pull request #9419 from owncloud/fix_search_results_in_root_dir
Fix search results in root dir & deprecate OC_Search_Provider
2014-07-04 18:28:54 +02:00
Jan-Christoph Borchardt c7e08745a7 Merge pull request #9455 from owncloud/breadcrumbs-backgroundsize
fix size of breadcrumb separator
2014-07-04 18:12:04 +02:00
Morris Jobke 88590d0805 fix size of breadcrumb separator 2014-07-04 17:45:43 +02:00
Björn Schießle a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
Bjoern Schiessle 5397101e1c improved unit tests 2014-07-04 17:37:35 +02:00
Bjoern Schiessle ddac446c5b always take unencrypted size 2014-07-04 16:44:50 +02:00
icewind1991 d3fab824f7 Merge pull request #9445 from owncloud/filelist-auth-error
Reload the page when the files app encounters an authentication error
2014-07-04 16:39:00 +02:00
Jan-Christoph Borchardt 5e89b53e78 Merge pull request #9438 from owncloud/design-fix-appsloadingfeedback
show loading feedback also when clicking 'Apps' entry in app list
2014-07-04 16:37:08 +02:00
Thomas Müller 691f613e84 Merge pull request #9450 from owncloud/update-snap.js
update snap.js to v2.0.0-rc1
2014-07-04 16:26:58 +02:00
Robin Appelman 4fe1cdd2a7 Add machine readable error messages to OC\JSON
Reload the files app in case of authentication errors, expired tokens or disabled app

Reloading will triger the full server side handeling of those errors

formatting

fix missing semicolon + some jshint warnings
2014-07-04 16:20:27 +02:00
Morris Jobke 574cb15c2d Merge pull request #9434 from owncloud/files-reloadpromiseissue
Fix reload call for all subclasses
2014-07-04 16:13:33 +02:00
Jörn Friedrich Dreyer aeeae5f1b2 Merge pull request #8308 from owncloud/case_insensitive_search_oracle
use case insensitive linguistic sort and compare when connecting to oracle
2014-07-04 15:51:57 +02:00
Thomas Müller f1901cab0a update snap.js to v2.0.0-rc1 2014-07-04 15:38:35 +02:00
Thomas Müller 2327d41b11 Merge pull request #9269 from owncloud/fix_versions_preview
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
Thomas Müller 2b76db81ea Merge pull request #9441 from owncloud/install-sql-host-default
Set localhost as default database host for installation
2014-07-04 15:08:43 +02:00
Morris Jobke 20e7a41076 Merge pull request #9444 from owncloud/design-fix-pointer
Design polish
2014-07-04 14:57:41 +02:00
Morris Jobke a7bf953757 fix cursor for other elements in top right corner 2014-07-04 14:57:11 +02:00
Morris Jobke aae118890a Merge pull request #9440 from owncloud/files-fileactionsdeepcopy
Fix FileActions merging override
2014-07-04 14:49:00 +02:00
Morris Jobke 807766729d also make strengthify transparent on setup submit - fixes #9436 2014-07-04 14:29:12 +02:00
Morris Jobke 3d13e04170 Merge pull request #9426 from owncloud/design-remoteshare-confirm
use icon-confirm instead of text for accepting remote share, works better with translations
2014-07-04 14:13:44 +02:00
Morris Jobke b7b42cf1c8 Merge pull request #9432 from owncloud/share-preview
Return and use isPreviewAvailable for share previews
2014-07-04 14:04:28 +02:00
Jan-Christoph Borchardt adc1474685 fix 'remember' label being slightly off in log in 2014-07-04 13:39:50 +02:00
Jan-Christoph Borchardt b62e96d6cd fix icons being slightly off in log in 2014-07-04 13:38:30 +02:00
Jan-Christoph Borchardt 338b6238a7 fix user menu name and image not showing clicky mouse pointer 2014-07-04 13:28:20 +02:00
Robin Appelman c111ce09a3 set localhost as default database host for installation 2014-07-04 13:24:42 +02:00
Vincent Petry 07118f599e Fix FileActions merging override
When merging FileActions, the register() functio needs to correctly
override the previously merged action handler without affecting the
original one.
2014-07-04 12:56:04 +02:00
Jan-Christoph Borchardt 83aca24b88 show loading feedback also when clicking 'Apps' entry in app list 2014-07-04 12:32:37 +02:00
Bjoern Schiessle 673b0f5eb9 add owner as parameter for delShareKey 2014-07-04 12:19:59 +02:00
Vincent Petry 59ca30d462 Fix reload call for all subclasses
All subclasses must also properly return the ajax call object.
2014-07-04 11:45:36 +02:00
Vincent Petry 5e8959a5b3 Return and use isPreviewAvailable for share previews
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
2014-07-04 11:16:23 +02:00
Bjoern Schiessle e9f5730869 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 10:34:54 +02:00
Bjoern Schiessle 3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Morris Jobke ac00e4b6e6 IE8 fixes 2014-07-04 08:13:05 +02:00
Jenkins for ownCloud e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Morris Jobke f1b3e03f7f fix version number - @karlitschek ;) 2014-07-04 07:50:18 +02:00
Frank Karlitschek 2e15c64825 master if 8.0 pre alpha now 2014-07-03 18:30:49 -04:00
Jan-Christoph Borchardt 8e617453e5 use icon-confirm instead of text for accepting remote share, works better with translations 2014-07-04 00:07:24 +02:00
Jan-Christoph Borchardt fc417465c0 Merge pull request #9410 from owncloud/shareownernamewidth
Improved remote share owner display
2014-07-03 23:45:06 +02:00