Commit graph

10609 commits

Author SHA1 Message Date
Frank Karlitschek
316807e0d3 Merge pull request #1624 from owncloud/singleselect
Split editable select code used for quota selection into a jquery plugin
2013-02-12 11:05:07 -08:00
Thomas Müller
5ee0adcd78 Merge pull request #1655 from owncloud/use-correct-tablename-in-cache-master
$this->numericId should be determined based on table storages not fileca...
2013-02-12 08:57:51 -08:00
Lukas Reschke
0f13da409b Merge pull request #1654 from owncloud/fixing-1652-master
user name and password need to be encoded as well
2013-02-12 08:36:24 -08:00
Thomas Mueller
b31cc83a2d $this->numericId should be determined based on table storages not filecache 2013-02-12 17:26:58 +01:00
Thomas Müller
251b676a06 Merge pull request #1616 from owncloud/cache_fixes_rebase
Cache: reuse known folder sizes when doing a shallow scan - rebase
2013-02-12 08:07:49 -08:00
Robin Appelman
b54dcd1999 Cache: fix scanner trying to use existing data when file isn't in cache 2013-02-12 16:48:21 +01:00
Thomas Mueller
f2baf1ae0e fixing syntax error 2013-02-12 16:18:48 +01:00
Thomas Mueller
318c0b3408 user name and password need to be encoded as well
fixes #1652
2013-02-12 15:56:31 +01:00
Jenkins for ownCloud
8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Robin Appelman
e1fe5279dd Cache: also preserve etags for files 2013-02-12 14:56:57 +01:00
Thomas Müller
ba1ab38e7f Merge pull request #1649 from owncloud/fixing-l10n-master
fixing issues with UTF8 characters in translatable strings
2013-02-12 05:42:57 -08:00
Bernhard Posselt
ffb3ac58cd Merge pull request #1650 from raghunayyar/personal-toggle-fix
Makes password toggle button inside input
2013-02-12 05:15:00 -08:00
Thomas Mueller
14e3d77d64 https://github.com/owncloud/core/pull/1598#discussion_r2976684 2013-02-12 13:10:26 +01:00
blizzz
b6ee118841 Merge pull request #1604 from owncloud/fix_ldap_internalname_generation
Improve generation of interal user names resp. group display names
2013-02-12 03:37:40 -08:00
raghunayyar
ed1c943f61 Makes password toggle button inside input. 2013-02-12 16:52:38 +05:30
Thomas Mueller
068595e5ac fixing issues with UTF8 characters in translatable strings 2013-02-12 12:16:13 +01:00
Frank Karlitschek
06c268833f Merge pull request #1648 from owncloud/checkRequesttoken
Check requesttoken
2013-02-12 02:43:43 -08:00
Lukas Reschke
a9c77ebaf8 Check requesttoken 2013-02-12 11:35:16 +01:00
Thomas Mueller
6b594c1eb8 fixing namespace 2013-02-12 11:05:12 +01:00
Thomas Mueller
a953786d79 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 11:01:14 +01:00
Thomas Mueller
646d60ee83 fixing namespace 2013-02-12 11:00:38 +01:00
Frank Karlitschek
2507e0da1d Merge pull request #1636 from owncloud/fixing-smb-master
Fixing smb master
2013-02-11 23:38:03 -08:00
Michael Gapczynski
ad6e133ca6 Replace another mount point placeholder 2013-02-11 20:35:40 -05:00
Michael Gapczynski
6eba790a75 Merge branch 'master' into external_storage_ui_feedback
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
2013-02-11 20:27:05 -05:00
Thomas Mueller
bcbf2e667b fixing sql server syntax for database creation 2013-02-12 01:17:01 +01:00
Thomas Mueller
98d7e0f7cd write any database messages / non critical errors to the log - don't pollute the browser 2013-02-12 01:14:53 +01:00
Thomas Mueller
8136851010 fixing indent 2013-02-12 01:05:47 +01:00
Thomas Mueller
b2dfdacaa1 fixing undefined variables 2013-02-12 01:04:35 +01:00
Thomas Mueller
76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +01:00
Thomas Müller
53111ccdc8 Merge pull request #1634 from irgsmirx/patch-6
Update/Bugfix lib/files/cache/legacy.php during database upgrade
2013-02-11 15:31:28 -08:00
Jenkins for ownCloud
fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Michael Gapczynski
6f08b1f829 Change wordings 2013-02-11 18:04:54 -05:00
Michael Gapczynski
808a13922c Remove the leading slash from the filename for opendir 2013-02-11 17:55:44 -05:00
Thomas Mueller
0c31c3cc3a fixing user for autotesting mssql 2013-02-11 23:46:32 +01:00
Thomas Müller
df528bf1db Merge pull request #1635 from irgsmirx/master-sqlserver
New/rebased/cleaned-up MS SQL Server support
2013-02-11 13:29:08 -08:00
Thomas Müller
04bf8c1b66 Merge pull request #1596 from owncloud/fix_470
webdav put improvements
2013-02-11 13:10:48 -08:00
Thomas Mueller
5731a1b01c introduce new virtual method hasUserListings() to determine if a user backend can list it's users. 2013-02-11 22:01:52 +01:00
Thomas Mueller
037fcde133 Merge branch 'master' into fixing-1424-master 2013-02-11 21:42:27 +01:00
Thomas Müller
58e57151e5 Merge pull request #1625 from owncloud/fix_shared_string
fix bug while changing string from "Share" to "Shared"
2013-02-11 12:39:16 -08:00
Thomas Mueller
0c1174770d use urlencode not rawurlencode 2013-02-11 21:25:29 +01:00
Thomas Müller
2cb2644254 Merge pull request #1613 from owncloud/multiselect-row-width
Files: fix width of table header when files are selected
2013-02-11 11:49:08 -08:00
Thomas Mueller
392be78162 the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still ..... 2013-02-11 20:32:44 +01:00
irgsmirx
062befd1fc Update lib/files/cache/legacy.php
Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.

Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
2013-02-11 20:28:36 +01:00
Jan-Christoph Borchardt
ca99ff31dc Merge pull request #1627 from owncloud/home-svg
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 08:02:14 -08:00
Jan-Christoph Borchardt
130f1006c1 Merge pull request #1626 from owncloud/share-indicator-position
Files: always show share action at the right
2013-02-11 07:43:04 -08:00
Jan-Christoph Borchardt
9c8f5de6c6 svg replacement for breadcrumb home icon, fix #1620 2013-02-11 16:19:22 +01:00
Robin Appelman
37ea784294 Files: always show share action at the right
Fixes #1619
2013-02-11 16:09:04 +01:00
Thomas Mueller
7776d047b2 [files_external] fix config gui for all users
backport of 9e05781ec2
2013-02-11 15:49:49 +01:00
Thomas Mueller
f512dea3be [files_external] fixing some undefined index 2013-02-11 15:45:10 +01:00
Thomas Mueller
89bc26210a [files_external] removing function as it's the same in the base class - THX Robin
Conflicts:
	apps/files_external/lib/smb.php
2013-02-11 15:44:35 +01:00