Commit graph

9789 commits

Author SHA1 Message Date
Thomas Müller
55d6b96348 Merge pull request #1719 from owncloud/fixing-1659-master
Fixing 1659 master
2013-02-17 11:47:35 -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 Müller
c0fafe8199 Merge pull request #1642 from owncloud/fix-googledrive
Remove the leading slash from the filename for opendir
2013-02-17 01:52:12 -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
Thomas Mueller
40739350c9 class Mapper no respects an unchanged physical root which will be excluded from slugifying the path 2013-02-15 17:42:17 +01:00
Thomas Mueller
b488800bd5 fix error in recursive search 2013-02-15 17:41:22 +01:00
Thomas Mueller
191da024fa new test cases added to search in sub folders 2013-02-15 17:40:52 +01:00
Thomas Mueller
c0f3d8578a folder should be created :-( 2013-02-15 17:40:07 +01:00
icewind1991
425d41aaf9 Merge pull request #1717 from owncloud/fix-warning-template
Fix strict standard warning in user template
2013-02-15 08:07:02 -08:00
Robin Appelman
b8e2454f68 Fix strict standard warning in user template 2013-02-15 16:10:06 +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
Thomas Mueller
e3ba0c3082 adding a new test class for mapped local using a dot in the datadir - reflects the issue described in #1659 2013-02-15 14:46:09 +01:00
blizzz
cd310add23 Merge pull request #1694 from owncloud/users-header
Users header
2013-02-15 05:36:21 -08:00
Thomas Müller
2ce398c68e Merge pull request #1715 from owncloud/fixing-1640-master
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 03:58:05 -08: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
Thomas Mueller
297c50db18 changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME 2013-02-15 12:24:49 +01:00
Jan-Christoph Borchardt
8b09fbc150 Merge pull request #1700 from owncloud/fixing-1680-master
Fixing 1680 master
2013-02-15 03:21:49 -08:00
Frank Karlitschek
6cee4c43ad Merge pull request #1714 from owncloud/fixing-1677-master
we should never drop a database
2013-02-15 03:19:07 -08:00
Thomas Mueller
102619ab87 we should never drop a database 2013-02-15 08:22:31 +01:00
Thomas Müller
166693426d Merge pull request #1712 from owncloud/debug-exception
Don't catch errors/exceptions when debug is enabled
2013-02-14 20:40:31 -08:00
Thomas Müller
92744be2dc Merge pull request #1713 from owncloud/fix-user-enabled
Fix quotes in OC_User::isEnabled
2013-02-14 20:38:31 -08:00
Robin Appelman
ab70f9bd25 Fix quotes in OC_User::isEnabled
this broke login
2013-02-15 03:20:02 +01:00
Robin Appelman
0395715348 set DEBUG from xdebug session before we first use it 2013-02-15 03:15:09 +01:00
Robin Appelman
bcabdd7dd5 Don't cache errors/exceptions when debug is enabled 2013-02-15 03:14:41 +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
Thomas Müller
4320f23c87 Merge pull request #1702 from owncloud/remove-images
remove unused images to lessen packaged size
2013-02-14 12:46:40 -08:00
Thomas Müller
29bf3552a2 Merge pull request #1703 from owncloud/firstrunwizard-icons
Firstrunwizard icons
2013-02-14 12:41:23 -08:00
Thomas Mueller
d2f34183a6 sort languages based on display name not the iso code 2013-02-14 21:34:15 +01:00
Thomas Mueller
a63f5ffa75 some more missing language code fallbacks 2013-02-14 20:59:14 +01:00
Lukas Reschke
b6cbfc9cfe Merge pull request #1705 from owncloud/DisableHSTS
Invalidate existing HSTS headers
2013-02-14 11:33:26 -08:00
Lukas Reschke
5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes
Sanitize HTML
2013-02-14 10:50:46 -08:00
Lukas Reschke
be194c5b5b Invalidate existing HSTS headers 2013-02-14 19:23:29 +01:00
Jan-Christoph Borchardt
5b20c30889 pixel align dark calendar and contacts icons 2013-02-14 18:52:32 +01:00
Jan-Christoph Borchardt
6adaf67f35 add dark calendar and contacts icon for firstrunwizard and others 2013-02-14 18:45:24 +01:00
Jan-Christoph Borchardt
bb52271d22 exchange bright caret with dark triangle 2013-02-14 18:22:45 +01:00
Jan-Christoph Borchardt
a410529b15 remove unused images to lessen packaged size 2013-02-14 18:20:53 +01:00
Lukas Reschke
c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Thomas Tanghus
7f1b8274a8 Merge pull request #1696 from owncloud/fixing-more-ie8-master
Fixing more ie8 master
2013-02-14 08:51:51 -08:00