Commit Graph

13021 Commits

Author SHA1 Message Date
Thomas Müller 69350c4e0d Merge pull request #4471 from owncloud/password-icon
use proper password icon, three dots are 'more'
2013-08-17 03:16:11 -07:00
Thomas Müller 264ee9df9a Merge pull request #4476 from owncloud/doc-on-master
fix difference between packaged version and master
2013-08-17 03:13:17 -07:00
Thomas Müller e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master
remove ru_RU - fixes #3135
2013-08-17 03:10:42 -07:00
kondou 2ee8425295 Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
2013-08-17 12:07:58 +02:00
Morris Jobke 50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css
Versions fix css
2013-08-17 03:01:24 -07:00
Bjoern Schiessle 16efd81a0e first check if file exists before checking the files size 2013-08-17 11:57:50 +02:00
Morris Jobke 60efd93d5d fixes for IE8 2013-08-17 11:56:52 +02:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Bjoern Schiessle 137cd2ca89 increase width of versions dialog 2013-08-17 11:01:43 +02:00
Morris Jobke 746d32eb05 fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
Morris Jobke 18769e1348 change font on login/install page from black to white 2013-08-17 10:26:30 +02:00
Jan-Christoph Borchardt b8b24bbae7 use proper password icon, three dots are 'more' 2013-08-16 17:59:48 +02:00
Robin Appelman 5c9aedac1b remove outdated quota proxy 2013-08-16 15:50:50 +02:00
Robin Appelman 8f10c9571f fix quota wrapper reporting negative free_space, breaking user interface
return 0 instead
2013-08-16 15:48:45 +02:00
Morris Jobke 837cefd8a3 Merge pull request #4442 from owncloud/no-smb-client-on-windows-master
no files external for SMB on windows
2013-08-16 02:48:42 -07:00
Jan-Christoph Borchardt 1e8849b04e Merge pull request #4314 from owncloud/css-fixes
Design fixes
2013-08-16 01:05:29 -07:00
Morris Jobke c196985ea3 Merge pull request #4032 from owncloud/more-whitespace
More whitespace
2013-08-16 01:02:03 -07:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Thomas Müller 0aa7dc9b89 tixing width and position of wider error messages 2013-08-16 00:56:09 +02:00
Jan-Christoph Borchardt d2767faf61 Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
2013-08-15 15:31:42 -07:00
Thomas Müller 57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Jan-Christoph Borchardt 399adf67b0 merge master into css-fixes 2013-08-16 00:29:43 +02:00
Thomas Müller 7279a07ca2 Merge branch 'master' into mimetype-defaults
Conflicts:
	apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
Jan-Christoph Borchardt b632b8f4e4 force show loading icon also for IE 2013-08-16 00:02:11 +02:00
Jan-Christoph Borchardt 3563eecfff merge master into more-whitespace 2013-08-15 23:25:20 +02:00
Thomas Müller bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
2013-08-15 14:08:01 -07:00
Thomas Müller b3241402b9 Merge pull request #4443 from owncloud/remove-jplayer-from-core-css
remove jPlayer css rules from core css file
2013-08-15 08:38:56 -07:00
Arthur Schiwon 42fc2295e4 LDAP: Update Host in configuration chooser on Save 2013-08-15 16:10:49 +02:00
Morris Jobke 5fb7aab7a0 remove jPlayer css rules from core css file 2013-08-15 16:08:49 +02:00
Morris Jobke b6ac711787 Merge pull request #4448 from owncloud/fixing-4444-master
Fixing 4444 master
2013-08-15 07:06:18 -07:00
Arthur Schiwon 479f893f6d LDAP: Show Host name in configuration drop down 2013-08-15 15:55:06 +02:00
Thomas Müller ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Thomas Müller c71408eaa9 fixing call to join 2013-08-15 15:38:33 +02:00
Bjoern Schiessle 7adfc27caf remove whitespaces and some leftover code from testing 2013-08-15 13:13:16 +02:00
Markus Goetz b9f3bb2426 Merge pull request #4441 from guruz/checkServer_cache_result
Cache OC_Util::checkServer() result in session
2013-08-15 03:52:16 -07:00
Arthur Schiwon cbfee81068 LDAP: slightly smaller input fields 2013-08-15 12:45:37 +02:00
Owen Winkler cd7e57e8ec Use JSON to send/receive group data.
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
Thomas Müller 05549884c6 no files external for SMB on windows 2013-08-15 12:00:02 +02:00
Markus Goetz 3972198b61 Cache OC_Util::checkServer() result in session
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Morris Jobke de89c31f5a Merge pull request #4302 from synchrone/master
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
Andreas Fischer 75e9015b54 Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once

* owncloud/fix_4326:
  use __DIR__ instead of realpath
  provide correct path for require_once
2013-08-14 21:20:53 +02:00
Thomas Müller 06670cef8a Merge pull request #4304 from tripflex/lostpw-themed
use theme name and title for password reset
2013-08-14 12:04:40 -07:00
Bjoern Schiessle a3d009e3b5 also create root dir if it doesn't exist yet 2013-08-14 20:51:36 +02:00
Thomas Müller 994537a5b9 Merge pull request #4372 from owncloud/allow_empty_configvalue
allow empty configvalue in appconfig
2013-08-14 10:34:06 -07:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals
Use plural translations
2013-08-14 10:23:19 -07:00
Thomas Müller b3b2b2d64c Merge pull request #4363 from owncloud/fix-4355
Send mime-type for new files
2013-08-14 09:46:10 -07:00
Bjoern Schiessle d314729cea use OC files API to create missing directory which should handle special chars in every environment correctly 2013-08-14 17:58:41 +02:00
Bjoern Schiessle 7d0e9cc685 use __DIR__ instead of realpath 2013-08-14 17:15:01 +02:00
Arthur Schiwon 7b17fd2f17 LDAP: move small info text strings into tooltips 2013-08-14 16:51:38 +02:00