mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,031 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

849 Commits

Author SHA1 Message Date
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Frank Karlitschek 072daf8850 Merge pull request #1885 from houqp/issue_1776 
when user changes displayName, also update it on expand button
 2013-02-26 00:19:42 -08:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 
Conflicts:
	core/templates/layout.user.php
 2013-02-25 17:16:03 -05:00
Qingping Hou c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Qingping Hou 278a6f5b41 update oldDisplayName value on displayName change 
This patch fixes a bug that can be reproduced in following way:

1. change displayName
2. clear text in displayName input click change again

Then you will get an error and previous displayName will be restored.

Expected behavior should restore the new updated displayName.
 2013-02-24 18:13:25 -05:00
Qingping Hou 2f3c5d8afc when user changes displayName, also update it on expand button 2013-02-24 18:07:35 -05:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup 
Whitespace cleanup
 2013-02-23 11:39:13 -08:00
Jenkins for ownCloud 6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bernhard Posselt 78fce83405 Merge pull request #1855 from owncloud/userlist_load_displaynames 
Fetch displayname in userlist ajax requests. Refs #1681
 2013-02-22 07:44:24 -08:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Thomas Tanghus 2268596e1a Fetch displayname in userlist ajax requests. Refs #1681 2013-02-22 14:51:21 +01:00
Thomas Müller 31d2b9bc07 Merge pull request #1838 from owncloud/fix-changedisplayname-call 
Fix error path in changedisplayname call
 2013-02-22 02:14:00 -08:00
Bart Visscher 83e613b45a Fix error path in changedisplayname call 2013-02-22 00:49:44 +01:00
Jenkins for ownCloud 734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher 19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher 83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Jenkins for ownCloud 99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Victor Dubiniuk 06dbcec5a1 Do not set password if it has't provided 2013-02-18 21:20:48 +03:00
Victor Dubiniuk c5f6a77dbd Correct new password input name 2013-02-18 21:15:32 +03:00
Lukas Reschke a984a27fa0 Sanitize user input 2013-02-18 08:04:35 +01:00
Jenkins for ownCloud 3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Jenkins for ownCloud c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Jenkins for ownCloud 83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
blizzz cd310add23 Merge pull request #1694 from owncloud/users-header 
Users header
 2013-02-15 05:36:21 -08:00
Jan-Christoph Borchardt ac32ae79af Merge pull request #1683 from owncloud/ie-fixes 
IE fixes
 2013-02-15 03:32:31 -08: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
Jenkins for ownCloud b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher 9058d398a7 Merge pull request #1662 from owncloud/style-cleanup 
Style cleanup
 2013-02-14 12:54:36 -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 5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes 
Sanitize HTML
 2013-02-14 10:50:46 -08:00
Lukas Reschke c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Thomas Mueller 2e280167b8 adding language code oc 2013-02-14 17:51:27 +01:00
Thomas Mueller 61e3c158b2 add some missing fallback language mappings 2013-02-14 17:46:53 +01:00
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
Thomas Mueller c5d716effe fixing javascript errors IE8 in apps management 2013-02-14 15:47:48 +01:00
Jan-Christoph Borchardt e8190c6511 fix user delete button not showing in IE, another SVG replacement issue 2013-02-14 13:01:51 +01:00
Thomas Mueller 022993c098 fixing javascript errors IE8 in user management 2013-02-14 12:59:59 +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 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