wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9708 commits 157 branches 562 tags 714 MiB
Commit graph

9708 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jan-Christoph Borchardt
f29a0ec67d also fix header alignment for multiselect columns 2013-02-14 16:38:34 +01:00
Jan-Christoph Borchardt
0f405d9895 fix Users settings header bar element positioning, close #1686 2013-02-14 16:38:10 +01:00
Jenkins for ownCloud
bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Thomas Müller
e1e77fe3be Merge pull request #1598 from owncloud/fixing-1424-master 
Fixing 1424 master
 2013-02-13 12:59:30 -08:00
Jan-Christoph Borchardt
6d7e324f4b Merge pull request #1574 from owncloud/installation-label-overflow 
Installation label overflow, fix #871
 2013-02-13 07:55:05 -08:00
Lukas Reschke
4f38b543b0 Merge pull request #1665 from owncloud/fix_ldap_1605 
LDAP: format dn before using it, not other way round. fixes #1605
 2013-02-13 06:59:16 -08:00
Arthur Schiwon
1e45453da2 LDAP: format dn before using it, not other way round. fixes #1605 2013-02-13 14:49:18 +01:00
Thomas Mueller
9d6f74c65e missing piece after merge 2013-02-13 10:59:41 +01:00
Thomas Mueller
bc43dd704f Merge branch 'master' into fixing-1424-master 
Conflicts:
	settings/js/users.js
 2013-02-13 01:18:01 +01:00
Jenkins for ownCloud
68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
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
Frank Karlitschek
2507e0da1d Merge pull request #1636 from owncloud/fixing-smb-master 
Fixing smb master
 2013-02-11 23:38:03 -08: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
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
Jenkins for ownCloud
39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Björn Schießle
45ed0c6010 if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's 2013-02-11 15:37:01 +01:00
Thomas Müller
766fbead96 Merge pull request #1578 from owncloud/mysql_admin_fix 
added l10n for db error messages
 2013-02-11 06:35:49 -08:00
Robin Appelman
e68e5cc849 Split editable select code used for quota selection into a jquery plugin 2013-02-11 15:18:14 +01:00