Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1e27b20a8bcc75258bd35de9fe10e80d80b1c69c
https://github.com/phpmyadmin/phpmyadmin/commit/1e27b20a8bcc75258bd35de9fe1…
Author: Bradley M. Kuhn <bkuhn(a)ebb.org>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M js/jquery/src/README
Log Message:
-----------
Reminder for developers to update jQuery sources when updating minified version.
Sources in js/jquery/src should be updated along with any updates to the
minified/concatenated version, so that the sources always correspond
properly.
Commit: 5338162feea7ab8581a6e9fa71a82c10ec05b87b
https://github.com/phpmyadmin/phpmyadmin/commit/5338162feea7ab8581a6e9fa71a…
Author: Bradley M. Kuhn <bkuhn(a)ebb.org>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M libraries/bfShapeFiles/ShapeFile.lib.php
Log Message:
-----------
Correct and complete license notices for bfShapeFiles.
I downloaded bfShapeFiles from http://bfshapefiles.sourceforge.net/
Exact URL was:
http://softlayer-dal.dl.sourceforge.net/project/bfshapefiles/bfshapefiles/0…
and the sha256sum of that zip file was 40c3e575397cede5342493ca12950fb0e2e9ef6b1e7fd1bf1337e9ac9f24f11c
I see that the file in that zip file named
bfShapeFiles-0.0.2/lib/ShapeFile.lib.php appears to be nearly identical to
this ShapeFile.lib.php in the phpMyAdmin repository.
Thus, I have taken the copyright and license notice from
bfShapeFiles-0.0.2/README.TXT and included it herein, so that full copyright
notice is properly displayed.
Furthermore, I note that since the notice does not refer to a specific
version of the GNU GPL, and that bfShapeFiles-0.0.2/GPL.TXT includes a copy
of GPLv2. This means that per GPLv2§9, the
bfShapeFiles-0.0.2/lib/ShapeFile.lib.php was licensed to the phpMyAdmin
project under GPLv2-or-later. I have thusly updated the @license link to so
indicate.
Commit: 8d8b3632212c5c9b1f407d79d4405b87bc2c9038
https://github.com/phpmyadmin/phpmyadmin/commit/8d8b3632212c5c9b1f407d79d44…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M js/jquery/src/README
M libraries/bfShapeFiles/ShapeFile.lib.php
Log Message:
-----------
Merge branch 'license-fixes' of git://github.com/bkuhn/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e0b5e4e1be0...8d8b3632212c
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: d756872e80bc54f2a94247d8a8f8878ecca0cafc
https://github.com/phpmyadmin/phpmyadmin/commit/d756872e80bc54f2a94247d8a8f…
Author: Rodrigo Souza <rodrigo.chrome(a)outlook.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2611 of 2611)
Commit: 9f0b3a457b2f1a718c699ee265c6a52b6c5fc56a
https://github.com/phpmyadmin/phpmyadmin/commit/9f0b3a457b2f1a718c699ee265c…
Author: Rodrigo Souza <rodrigo.chrome(a)outlook.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2611 of 2611)
Commit: 2f763b7a4ae837702a754944a6a0ab88b6a3adec
https://github.com/phpmyadmin/phpmyadmin/commit/2f763b7a4ae837702a754944a6a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M libraries/db_info.inc.php
Log Message:
-----------
Drizzle does not support `show full tables` queries
Commit: ae3eef1b9fa547365f867221611eb6c650a81394
https://github.com/phpmyadmin/phpmyadmin/commit/ae3eef1b9fa547365f867221611…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ChangeLog
M js/tbl_change.js
Log Message:
-----------
bug #3992 Multi-row edit doesn't clear values when checking NULL
Commit: 58e196045e1a7269abf10d8992f3436ad7d27cef
https://github.com/phpmyadmin/phpmyadmin/commit/58e196045e1a7269abf10d8992f…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ChangeLog
M export.php
M js/tbl_structure.js
M po/pt_BR.po
Log Message:
-----------
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
Conflicts:
ChangeLog
Commit: a0b299b758e6857158af4fa7d2200012f15fcf53
https://github.com/phpmyadmin/phpmyadmin/commit/a0b299b758e6857158af4fa7d22…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ChangeLog
M js/tbl_change.js
Log Message:
-----------
Merge branch 'QA_4_0'
Conflicts:
ChangeLog
js/tbl_change.js
po/pt_BR.po
Commit: 3b2d624ce2d4cf577649d3dca62452e4fdcdbdc3
https://github.com/phpmyadmin/phpmyadmin/commit/3b2d624ce2d4cf577649d3dca62…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M error_report.php
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/kn.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/272a658412ef...3b2d624ce2d4