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

884 Commits

Author SHA1 Message Date
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Jenkins for ownCloud 6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Frank Karlitschek 36a1bcb732 Merge pull request #2061 from owncloud/app-text 
Add the description as text and not as html
 2013-03-04 00:01:26 -08:00
Frank Karlitschek d70912e72b Merge pull request #2060 from owncloud/escapeGroupname 
Sanitize uid, group and quota
 2013-03-04 00:00:47 -08:00
Frank Karlitschek 17f7bd4c14 Merge pull request #2059 from owncloud/getlog 
Add log as text and not as HTML
 2013-03-04 00:00:04 -08:00
Lukas Reschke 0252479e3e Add the description as text and not as html 2013-03-04 00:19:07 +01:00
Lukas Reschke 86a7202cda Sanitize uid, group and quota 2013-03-04 00:11:46 +01:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Lukas Reschke 962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +01:00
Bart Visscher 376f350af2 Fix encoding settings ajax getlog 2013-03-03 23:14:36 +01:00
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Thomas Müller 4c8c974740 Merge pull request #2020 from owncloud/fixing-bugtracker-link-master 
change bug tracker links to https://github.com/owncloud/core/blob/master...
 2013-03-02 02:16:45 -08:00
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Bart Visscher f21ecef0b4 Merge pull request #2019 from owncloud/fixing-languages-again-master 
some more new languages recently introduced to ownCloud
 2013-03-01 14:55:27 -08:00
Lukas Reschke fadb11253b Merge branch 'master' into fixing-bugtracker-link-master 
Conflicts:
	core/templates/exception.php
	settings/templates/help.php
 2013-03-01 23:41:23 +01:00
Thomas Mueller f9b454dab1 change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md 2013-03-01 23:32:43 +01:00
Thomas Mueller 6708dd80cd some more new languages recently introduced to ownCloud 2013-03-01 23:28:54 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Jenkins for ownCloud d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Jenkins for ownCloud a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke 7311c2bb5d Remove uneeded OAuth files 2013-02-27 23:26:00 +01:00
Lukas Reschke 229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Björn Schießle f69fa2726c Merge pull request #1958 from owncloud/fixing-1933-master 
the locale name is no longer part of the translation string
 2013-02-27 03:15:03 -08:00
Thomas Mueller c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00
Bernhard Posselt a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting 
Sort after display name + LDAP server side sorting
 2013-02-27 02:39:22 -08:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Arthur Schiwon 60d4fdda57 sort users according to display name 2013-02-26 22:56:55 +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