Commit Graph

19479 Commits

Author SHA1 Message Date
Morris Jobke 45a4751f0e Merge pull request #9499 from owncloud/shares-hidetokenrecipient
Do not show recipient for link shares in file list
2014-07-07 20:02:59 +02:00
Morris Jobke 29bdfc0ce2 Merge pull request #9502 from owncloud/add_ocsids
Add ocsids for shipped apps in core repo
2014-07-07 19:58:41 +02:00
Morris Jobke 54a8dce380 Merge pull request #9415 from owncloud/external-sharedialog
Improved external share dialog
2014-07-07 19:51:54 +02:00
Morris Jobke b2377129b6 Merge pull request #9494 from owncloud/issue/9490
[issues/9490] \OC::$WEBROOT is invalid when called from cron.php
2014-07-07 19:36:41 +02:00
Morris Jobke ed9b9ba671 Merge pull request #9501 from owncloud/shares-listsort
Fixed shared list sorting
2014-07-07 19:31:32 +02:00
Stephane V 179a707e29 Fixes #9497 2014-07-07 18:32:51 +02:00
Georg Ehrke e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Vincent Petry 4ba492f28d Fixed shared list sorting
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
2014-07-07 16:49:32 +02:00
Vincent Petry 8ddff52c51 Do not show recipient for link shares in file list
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 16:33:23 +02:00
Vincent Petry 130b8018a1 Improved external share dialog
Changed title, label and buttons.
Removed icon.
2014-07-07 15:57:26 +02:00
Vincent Petry 71fe5d672e Fixed dialogs styling, reversed buttons
Default dialog button is now on the right, other one on the left.
2014-07-07 15:56:42 +02:00
Thomas Müller 268af9039a Merge pull request #9492 from owncloud/repait-innodb-master
MySQL: adding repair step to convert MyIsam tables to InnoDB
2014-07-07 15:50:34 +02:00
Robin Appelman 18572b2367 Dont delete versions as local files 2014-07-07 15:49:08 +02:00
Robin Appelman 128c226063 When changing the mountpoint of an external storage, ensure the old one is removed 2014-07-07 15:40:01 +02:00
Joas Schilling bef0934719 Add comment to overwrite* configs about CLI/cron problems 2014-07-07 15:08:46 +02:00
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
Thomas Müller b091b15f0b MySQL: adding repair step to convert MyIsam tables to InnoDB 2014-07-07 12:32:24 +02:00
Jan-Christoph Borchardt b271e05bc9 Merge pull request #9488 from owncloud/fix-ctrl-click-app
fix loading spinner on ctrl click a app entry- fixes #9063
2014-07-07 11:49:14 +02:00
Morris Jobke a26370e585 Merge pull request #9479 from stephane84/fix-9147
Log table design glitch in date field
2014-07-07 11:27:56 +02:00
Vincent Petry 5c444c2da8 Merge pull request #9468 from owncloud/fix_logout_error_messages
better validation: cadd extra check if appinfo/info.xml exists
2014-07-07 10:58:23 +02:00
Morris Jobke ae8e27cc42 fix loading spinner on ctrl click a app entry- fixes #9063 2014-07-07 10:39:48 +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
Stephane V e6cea04a30 Bug 9147 owncloud/core
Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
2014-07-06 16:15:33 +02: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
Georg Ehrke 1565089c02 fix phpDocBlock for OC_App::getAppInfo 2014-07-05 13:32:21 +02:00
Georg Ehrke 042ec984bd better validation: cadd extra check if appinfo/info.xml exists 2014-07-05 13:28:47 +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