Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0a0879ea1e517edeec0405aeccc9e7761d77f4c2
https://github.com/phpmyadmin/phpmyadmin/commit/0a0879ea1e517edeec0405aeccc…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M js/codemirror/addon/hint/sql-hint.js
M js/codemirror/lib/codemirror.css
M js/codemirror/lib/codemirror.js
M js/codemirror/mode/javascript/javascript.js
Log Message:
-----------
Upgrade CodeMirror to version 5.4.0
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 047b962d6e7518ffb3cc2bbc6dfebe5e66cbf576
https://github.com/phpmyadmin/phpmyadmin/commit/047b962d6e7518ffb3cc2bbc6df…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M ChangeLog
M db_export.php
M export.php
M js/export.js
M js/functions.js
M js/tbl_operations.js
M libraries/Util.class.php
M libraries/display_export.lib.php
M libraries/export.lib.php
M libraries/plugins/import/ImportOds.class.php
M libraries/plugins/import/ImportXml.class.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/eo.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/fy.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/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ky.po
M po/li.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/ne.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/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
M scripts/create-release.sh
M sql.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7b6e1d8f5f7b...047b962d6e75
Branch: refs/heads/django
Home: https://github.com/phpmyadmin/website
Commit: 20f0df100b282ed63b3209b1a46cf59450d50a2f
https://github.com/phpmyadmin/website/commit/20f0df100b282ed63b3209b1a46cf5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-06-29 (Mon, 29 Jun 2015)
Changed paths:
M files/feeds.py
M files/management/commands/import_rss_releases.py
M files/models.py
M files/views.py
M pmaweb/tests.py
M pmaweb/urls.py
M security/management/commands/import_pmasa.py
M security/models.py
Log Message:
-----------
Coding style improvements
Signed-off-by: Michal Čihař <michal(a)cihar.com>