Commit graph

4780 commits

Author SHA1 Message Date
Jenkins for ownCloud
3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Thomas Müller
8e76a98d2f Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
2013-02-17 11:53:51 -08:00
Bernhard Posselt
90939c8f12 Merge pull request #1708 from owncloud/style-cleanup-user_ldap
Style cleanup user_ldap
2013-02-17 07:02:45 -08:00
Thomas Mueller
325746ae45 Merge branch 'master' into fix-googledrive 2013-02-17 09:41:37 +01:00
Thomas Müller
0f8058cb12 Merge pull request #1699 from owncloud/multiselect-bar-fix
fix multiselect bar offset on shared page, close #1339 finally
2013-02-17 00:39:16 -08:00
Thomas Müller
71472c21ed Merge pull request #1730 from owncloud/ldap_fix_warnings
LDAP: check array with isset first to avoid warnings about undefined ind...
2013-02-17 00:25:40 -08:00
Jenkins for ownCloud
c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Frank Karlitschek
17d21a84b6 Merge pull request #1729 from owncloud/fix_1727
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
2013-02-16 05:48:18 -08:00
Lukas Reschke
4708d4549d Add missing requesttoken
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +01:00
Arthur Schiwon
a28df74ee5 LDAP: check array with isset first to avoid warnings about undefined index 2013-02-16 02:33:19 +01:00
Arthur Schiwon
bef48bad8b LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727 2013-02-16 02:06:45 +01:00
Jenkins for ownCloud
83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
Bart Visscher
6c197227d0 Join split translated strings 2013-02-15 15:58:52 +01:00
Bart Visscher
5616690506 Style cleanup files_external 2013-02-15 15:58:52 +01:00
Bart Visscher
925de78cec Join split translated strings 2013-02-15 15:51:55 +01:00
Bart Visscher
92a36ca8b8 Join short comment lines 2013-02-15 15:45:34 +01:00
Jan-Christoph Borchardt
ac32ae79af Merge pull request #1683 from owncloud/ie-fixes
IE fixes
2013-02-15 03:32:31 -08:00
Björn Schießle
08b68aac6c check if glob() returns any results, fix for stable45 was already approved by pull request #1695 2013-02-15 12:29:52 +01:00
Jenkins for ownCloud
b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher
1ef2ecd6e8 Style cleanup user_ldap 2013-02-14 22:16:48 +01:00
Bart Visscher
9058d398a7 Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
2013-02-14 12:54:36 -08:00
Jan-Christoph Borchardt
d1dcb282cb fix multiselect bar offset on shared page, close #1339 finally 2013-02-14 17:40:08 +01:00
Thomas Mueller
6a250c877f fixing javascript errors IE8 in personal settings 2013-02-14 16:10:52 +01:00
Bart Visscher
f4c9d4c067 Merge pull request #1682 from owncloud/fix-ie8-master
Fix ie8 master
2013-02-14 06:10:00 -08:00
Björn Schießle
ae172ce7de improved description of the trash bin app 2013-02-14 13:01:02 +01:00
Björn Schießle
bd22e948ca call 'Trash bin' 'Deleted files' 2013-02-14 12:32:14 +01:00
Thomas Mueller
a03d70209f fixing undefined originalEvent 2013-02-14 12:19:50 +01:00
Jan-Christoph Borchardt
b8a6bca2d3 always show checkbox when selected, also in IE8, fix #1621 2013-02-14 10:40:23 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +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
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
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
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
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
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
Jenkins for ownCloud
fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Michael Gapczynski
808a13922c Remove the leading slash from the filename for opendir 2013-02-11 17:55:44 -05: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 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
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