Commit Graph

14690 Commits

Author SHA1 Message Date
Vincent Petry fa341e49a8 Merge pull request #5341 from owncloud/fix-logout-link-html
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
raghunayyar 4eed240296 Should Display PasswordToggle Eye Everywhere. 2013-10-15 11:36:44 +05:30
Thomas Müller 7caf011b9a fixing syntax for openssl config 2013-10-15 00:44:55 +02:00
Thomas Müller bf99d9233c on windows we supply an openssl.cnf file in order to execute the unit tests properly 2013-10-15 00:29:47 +02:00
Thomas Müller e3489b36ff any preview requiring the which command will not be used on Windows 2013-10-15 00:15:45 +02:00
Thomas Müller 86f6f0ca92 Merge branch 'master' into coverage-on-windows-master 2013-10-15 00:09:00 +02:00
icewind1991 2bb4527269 Merge pull request #5340 from owncloud/fixing-5251-master
streamCopy() should return proper structure.
2013-10-14 14:29:36 -07:00
Andreas Fischer 06f9b7b862 Fix logout link HTML.
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
Thomas Müller 6df5c7ebd5 streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
Ramiro Aparicio 8ac518bb3e Show (group) after groups in share dropdown 2013-10-14 20:17:45 +02:00
Vincent Petry 4ae1d08241 Merge pull request #5330 from owncloud/files-removedfileactionsbkg
Removed extra bkg color on file actions when row is selected/hovered on
2013-10-14 09:23:06 -07:00
Vincent Petry fab4102c51 Disabled ajax mode for public files view
Ajax loading is not supported yet for public files view.
This fix disabled the history API, ajax loading and ajax directory
switch in public mode until it is implemented properly.
2013-10-14 17:47:38 +02:00
Bjoern Schiessle 3380bd650f avatars should also work with encryption after pr #5332 was merged 2013-10-14 17:30:24 +02:00
Vincent Petry 09b084dfed Fixed file permissions after public upload
Fixes #5328
2013-10-14 17:28:53 +02:00
Bjoern Schiessle d3af7a9aa4 check if we are writing to user/files, otherwise skip encryption 2013-10-14 17:13:14 +02:00
Vincent Petry e79d853867 Removed extra bkg color on file actions when row is selected/hovered on 2013-10-14 17:05:24 +02:00
Bjoern Schiessle 58196304b8 fix array key 2013-10-14 16:43:18 +02:00
Bjoern Schiessle 4151fd3ed9 try to fix unencrypted file size if it doesn't look plausible 2013-10-14 16:34:14 +02:00
Vincent Petry c60f52ddf7 Fixed app list right container to not overlap left container scrollbar
- Container widths in apps list now use pixels instead of em
- Container widths now match properly and rightcontainer doesn't overlap
  the scrollbar any more
2013-10-14 16:29:33 +02:00
Thomas Müller c97b52090e Merge pull request #4867 from owncloud/fixing-4546-master
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
Frank Karlitschek c6314b1c03 Merge pull request #5323 from owncloud/files-external-missinggridstyle
Added missing "grid" class on external storage's table
2013-10-14 06:31:35 -07:00
Thomas Müller 5318df3b3c there shall be tabs 2013-10-14 14:51:25 +02:00
Thomas Müller fb3829e8b8 file system is now initialized with apache authentication as well 2013-10-14 14:46:43 +02:00
Georg Ehrke 71601a7c6f implement previews for markdown 2013-10-14 14:10:47 +02:00
Vincent Petry b8285ca316 Added missing "grid" class on external storage's table 2013-10-14 14:02:39 +02:00
Jan-Christoph Borchardt e9ce704f17 Merge pull request #5297 from owncloud/quota-style
Fixes Default Quota Style in User Management.
2013-10-14 03:59:51 -07:00
Vincent Petry de920736c5 Merge pull request #5320 from owncloud/fix_app_sorting
Fix app sorting
2013-10-14 02:29:27 -07:00
Frank Karlitschek 258ccdfabe case insensitive sort 2013-10-14 11:15:04 +02:00
Frank Karlitschek a201a66878 fix style 2013-10-14 10:57:00 +02:00
Thomas Müller a5e808defc Merge branch 'master' into fixing-4546-master
Conflicts:
	lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
Frank Karlitschek f06df170cb finally fix the app sorting 2013-10-14 10:54:38 +02:00
raghunayyar e0d3046590 Fixes Default Quota Style in User Management. 2013-10-14 10:35:24 +02:00
Jenkins for ownCloud f3336f8877 [tx-robot] updated from transifex 2013-10-13 20:33:30 -04:00
Raghu Nayyar e8bede5e0d Merge pull request #5318 from owncloud/show_channel
show the channel. Also mark git as git channel so that someone can see
2013-10-13 13:16:24 -07:00
Morris Jobke a021a12b3b Merge pull request #5253 from owncloud/externalstorage-adminstatusindicator
Fixed external storage status indicator in admin page
2013-10-13 13:03:02 -07:00
Frank Karlitschek 7cf81f2d12 show the channel. Also mark git as git channel so that someone can see where this build comes from 2013-10-13 21:51:47 +02:00
kondou f828b51ede Hide files list header, when theres no files to see 2013-10-12 17:28:20 +02:00
Thomas Müller 3f54e3c783 Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles
Fixed table grid styles for IE8
2013-10-12 03:51:01 -07:00
raghunayyar e961dbaa38 Shows The Eye permanently in the Confirm Password field in Personal Settings - fix #5167 2013-10-12 12:42:23 +02:00
Thomas Müller 8be9773c73 Merge pull request #5303 from owncloud/fix-unlogged-session-error
Log an error when session initialization fails before ownCloud is intalled
2013-10-12 03:35:33 -07:00
Morris Jobke e6d034a60b Merge pull request #5290 from owncloud/fixing-5191-master
Installation. Show advanced section on error. Fixes #5191
2013-10-12 03:28:44 -07:00
Thomas Müller fce198874f Merge pull request #5272 from mrflix/master
fix label to checkbox binding in admin -> force-https
2013-10-12 01:41:30 -07:00
Thomas Müller 46dd273b9c Merge pull request #5287 from owncloud/core-layoutviewportdirective
Fixed viewport layout using commas instead of semicolons
2013-10-12 01:36:20 -07:00
Thomas Müller bff6ca212a Merge pull request #5301 from owncloud/versioning_preview_shared
versioning preview also for shared files
2013-10-12 01:32:25 -07:00
Tom Needham 14617682c8 Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error 2013-10-12 09:15:59 +01:00
Tom Needham 6f8dd54788 Include exception message in log entry when session fails to start 2013-10-12 09:15:08 +01:00
Thomas Müller 60541358ac Merge pull request #5280 from owncloud/shorten_controller_namespace
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 12:51:07 -07:00
Morris Jobke 22bb9762fd Merge pull request #5304 from owncloud/files-deleteiconpositionfix
Fixed position of "delete" icon in files app
2013-10-11 12:39:33 -07:00
Morris Jobke 6c85fc41aa Merge pull request #5296 from owncloud/remove-chosen-hack
Removes the Bogus Label
2013-10-11 12:30:59 -07:00
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00