Git June 2015

git@phpmyadmin.net

28 participants
459 discussions

[Phpmyadmin-git] [phpmyadmin/website] ed1d78: Include sha1/md5/signature information for themes ...
by Michal Čihař 23 Jun '15

23 Jun '15

Branch: refs/heads/django Home: https://github.com/phpmyadmin/website Commit: ed1d787f8b27e2f422d960b1bc4203b26e2f4705 https://github.com/phpmyadmin/website/commit/ed1d787f8b27e2f422d960b1bc4203… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M files/management/commands/import_files.py M files/management/commands/import_themes.py A files/migrations/0013_auto_20150623_0638.py M files/models.py A files/utils.py Log Message: ----------- Include sha1/md5/signature information for themes as well Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c067861c7eb3934e4d23fd155b1d37ccb24ceb8a https://github.com/phpmyadmin/website/commit/c067861c7eb3934e4d23fd155b1d37… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M files/management/commands/import_files.py M files/management/commands/import_themes.py M files/models.py M pmaweb/context_processors.py M pmaweb/settings.py M pmaweb/urls.py Log Message: ----------- Incldue file headers Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ab26b2373b8ab6396c4371cb9f60b28f4fffbc0f https://github.com/phpmyadmin/website/commit/ab26b2373b8ab6396c4371cb9f60b2… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M TODO Log Message: ----------- Update list of tasks Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a5d26f9b36bed48e2d4312aca9bcb32cd3971f56 https://github.com/phpmyadmin/website/commit/a5d26f9b36bed48e2d4312aca9bcb3… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M data/__init__.py M data/awards.py M data/menu.py M data/redirects.py M data/screenshots.py M data/sf.py M data/sitemap.py M data/themes.py M files/__init__.py M files/admin.py M files/management/__init__.py M files/management/commands/__init__.py M files/management/commands/rank_downloads.py M files/tests.py M files/views.py M helper/__init__.py M helper/cache.py M helper/date.py M helper/log.py M helper/stringfmt.py M manage.py M news/__init__.py M news/admin.py M news/management/__init__.py M news/management/commands/__init__.py M news/management/commands/import_rss_news.py M news/models.py M news/tests.py M news/views.py M pmaweb/__init__.py M pmaweb/tests.py M pmaweb/wsgi.py M render.py Log Message: ----------- Update files copyright information Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6c29eef5dc5ab052499e3b11a71c4c4431178e63 https://github.com/phpmyadmin/website/commit/6c29eef5dc5ab052499e3b11a71c4c… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M TODO R data/sitemap.py M pmaweb/urls.py Log Message: ----------- Handle link to changelog Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 956fb4f5e1d69dc254167b64e094a1f81146c40a https://github.com/phpmyadmin/website/commit/956fb4f5e1d69dc254167b64e094a1… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/context_processors.py Log Message: ----------- Do not break on non existing pages Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 0b8ef320fca319830fdba956c9de21a5f60d1a22 https://github.com/phpmyadmin/website/commit/0b8ef320fca319830fdba956c9de21… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/tests.py M pmaweb/urls.py A pmaweb/views.py Log Message: ----------- Add handlers for old URLs and test them Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 13269f6c7ace104399b3d15c36bafd3d408c1a17 https://github.com/phpmyadmin/website/commit/13269f6c7ace104399b3d15c36bafd… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/contest.html Log Message: ----------- Fix contest page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 416f3b76d6f22c1f15dc834737b71836a86238b4 https://github.com/phpmyadmin/website/commit/416f3b76d6f22c1f15dc834737b718… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/15-years.html Log Message: ----------- Fix 15-years page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: fa8b3bb5ad15f001852acacfc31b08efdeb76d7f https://github.com/phpmyadmin/website/commit/fa8b3bb5ad15f001852acacfc31b08… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/urls.py Log Message: ----------- Add redirects for security Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b557e78997c92ac518f898c6e997b9416b52308a https://github.com/phpmyadmin/website/commit/b557e78997c92ac518f898c6e997b9… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/about-website.html M pmaweb/templates/about.html Log Message: ----------- Implement about pages Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 43707e025b65b54411143bc10733cd62eafeb3aa https://github.com/phpmyadmin/website/commit/43707e025b65b54411143bc10733cd… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/about-website.html Log Message: ----------- Adjust about website page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5311e1377399e3d4158c57cbecbea54a9e50bfd3 https://github.com/phpmyadmin/website/commit/5311e1377399e3d4158c57cbecbea5… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/about-website.html M pmaweb/views.py Log Message: ----------- Fix back links Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ecefce05964072e019eaf5a3941a31a2d62705ec https://github.com/phpmyadmin/website/commit/ecefce05964072e019eaf5a3941a31… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/translations.html Log Message: ----------- Initial port of translations page (no content yet) Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3e875cbc97675daf74acd7e57af317625223216e https://github.com/phpmyadmin/website/commit/3e875cbc97675daf74acd7e57af317… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/news.html M pmaweb/templates/search.html Log Message: ----------- Migrate news template Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 48ab7f3cc91d7bcdc2a2f7a1b5bc84f82f922c6c https://github.com/phpmyadmin/website/commit/48ab7f3cc91d7bcdc2a2f7a1b5bc84… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/views.py Log Message: ----------- Fix redirect Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ad5ba69a3e84b6922b0e20a11b1d7ba7b0b306a2 https://github.com/phpmyadmin/website/commit/ad5ba69a3e84b6922b0e20a11b1d7b… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/license.html Log Message: ----------- Fix license page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 5831fc79ac76a5ceeeade9d73a9af94a6f7493cb https://github.com/phpmyadmin/website/commit/5831fc79ac76a5ceeeade9d73a9af9… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/context_processors.py M pmaweb/templates/awards.html Log Message: ----------- Migrate awards page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 027cedeb92d889ba34d8dd7883c079104527b0ae https://github.com/phpmyadmin/website/commit/027cedeb92d889ba34d8dd7883c079… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/tests.py M pmaweb/urls.py M pmaweb/views.py Log Message: ----------- Correctly handle old security.php page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9408ff661c55d38ecf6770c57c488ff61c99aa84 https://github.com/phpmyadmin/website/commit/9408ff661c55d38ecf6770c57c488f… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M TODO M pmaweb/templates/sitemap.html Log Message: ----------- Layout for sitemap page Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 907941470799580bd62a2c672423451ae1204d8a https://github.com/phpmyadmin/website/commit/907941470799580bd62a2c67242345… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M pmaweb/templates/_gitdl.html M pmaweb/templates/develop.html M pmaweb/templates/downloads.html Log Message: ----------- Fix git information inclusion Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ae3fbcfe3368721d8b05dccc76cf85304f785b76 https://github.com/phpmyadmin/website/commit/ae3fbcfe3368721d8b05dccc76cf85… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: R pmaweb/templates/_sample_.html Log Message: ----------- Remove no longer up to date sample page Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/website/compare/bf68144c03fd...ae3fbcfe3368

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 36a1ab: Translated using Weblate (Hungarian)
by Balázs Úr 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 36a1abbd9a3661bcd2e2fcc2e174785e12abd582 https://github.com/phpmyadmin/phpmyadmin/commit/36a1abbd9a3661bcd2e2fcc2e17… Author: Balázs Úr <urbalazs(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M po/hu.po Log Message: ----------- Translated using Weblate (Hungarian) Currently translated at 100.0% (3125 of 3125 strings) [CI skip]

1 0

[Phpmyadmin-git] [phpmyadmin/scripts] 35ebb2: Ignore merge commits when checking code
by Michal Čihař 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 35ebb232b487c14469d73e038faac734c5f3b92e https://github.com/phpmyadmin/scripts/commit/35ebb232b487c14469d73e038faac7… Author: Michal Čihař <michal(a)cihar.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M hooks/commits.php Log Message: ----------- Ignore merge commits when checking code - Signed-off-by does not make sense - Whitespace errors in there are usually coming from elsewhere Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2e47bb: bug #4967 Field named '0' is not recognized
by Madhura Jayaratne 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2e47bb08eb55fc1c9d19a076211a6782fd5d5999 https://github.com/phpmyadmin/phpmyadmin/commit/2e47bb08eb55fc1c9d19a076211… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M libraries/DatabaseInterface.class.php Log Message: ----------- bug #4967 Field named '0' is not recognized Commit: a6e3855ddfa414931657b2d36983c6a1cd9349f9 https://github.com/phpmyadmin/phpmyadmin/commit/a6e3855ddfa414931657b2d3698… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M ChangeLog M doc/config.rst Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c5f8b1aa8506...a6e3855ddfa4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e19d64: Minor style adjustment
by Isaac Bennetch 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e19d64785ba1c9558bdfd82f80e390b16335db7a https://github.com/phpmyadmin/phpmyadmin/commit/e19d64785ba1c9558bdfd82f80e… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2015-06-22 (Mon, 22 Jun 2015) Changed paths: M doc/config.rst Log Message: ----------- Minor style adjustment Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Commit: c5f8b1aa85063ccf1e8620e383a489cc6aabe111 https://github.com/phpmyadmin/phpmyadmin/commit/c5f8b1aa85063ccf1e8620e383a… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2015-06-22 (Mon, 22 Jun 2015) Changed paths: M ChangeLog Log Message: ----------- ChangeLog for RFE 342 and RFE 1060 Signed-off-by: Isaac Bennetch <bennetch(a)gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2abda1c1d395...c5f8b1aa8506

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 81659d: Match the old query, so the tests won't complain
by Madhura Jayaratne 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 81659dc2cb9d49126e82c266e8b8e8328c1fc45f https://github.com/phpmyadmin/phpmyadmin/commit/81659dc2cb9d49126e82c266e8b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M libraries/DatabaseInterface.class.php Log Message: ----------- Match the old query, so the tests won't complain Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 2abda1c1d3959fb4c6cbc52a4fbcaf6e5f9e4388 https://github.com/phpmyadmin/phpmyadmin/commit/2abda1c1d3959fb4c6cbc52a4fb… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M config.sample.inc.php M db_designer.php M doc/config.rst M examples/config.manyhosts.inc.php M js/pmd/move.js M libraries/config.default.php M libraries/config/setup.forms.php M libraries/db_designer.lib.php M libraries/relation.lib.php M sql/create_tables.sql M sql/create_tables_drizzle.sql M templates/designer/side_menu.phtml M test/libraries/PMA_relation_cleanup_test.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bb435183a35d...2abda1c1d395

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 54a480: Designer settings saved in a new table in configur...
by Isaac Bennetch 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 54a480e8eba6241af678e2d6c087504dd13e80f7 https://github.com/phpmyadmin/phpmyadmin/commit/54a480e8eba6241af678e2d6c08… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-06-21 (Sun, 21 Jun 2015) Changed paths: M config.sample.inc.php M db_designer.php M doc/config.rst M examples/config.manyhosts.inc.php M js/pmd/move.js M libraries/config.default.php M libraries/config/setup.forms.php M libraries/db_designer.lib.php M libraries/relation.lib.php M sql/create_tables.sql M sql/create_tables_drizzle.sql M templates/designer/side_menu.phtml M test/libraries/PMA_relation_cleanup_test.php Log Message: ----------- Designer settings saved in a new table in configuration storage Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: bb435183a35d76907b21b2d11c344bb56095c01b https://github.com/phpmyadmin/phpmyadmin/commit/bb435183a35d76907b21b2d11c3… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2015-06-22 (Mon, 22 Jun 2015) Changed paths: M config.sample.inc.php M db_designer.php M doc/config.rst M examples/config.manyhosts.inc.php M js/pmd/move.js M libraries/config.default.php M libraries/config/setup.forms.php M libraries/db_designer.lib.php M libraries/relation.lib.php M sql/create_tables.sql M sql/create_tables_drizzle.sql M templates/designer/side_menu.phtml M test/libraries/PMA_relation_cleanup_test.php Log Message: ----------- Merge pull request #1737 from devenbansod/rfe1060_new Designer settings saved in a new table in configuration storage Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e0750d93ae50...bb435183a35d

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e0750d: Distinguish between null and empty default values
by Madhura Jayaratne 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e0750d93ae50dfd2c103b16d4a5b517e564bec51 https://github.com/phpmyadmin/phpmyadmin/commit/e0750d93ae50dfd2c103b16d4a5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M libraries/tbl_columns_definition_form.inc.php Log Message: ----------- Distinguish between null and empty default values Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bf55d5: Remove dead code. Following commit fd77f8d.
by Madhura Jayaratne 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bf55d536adca6d82bee288a91d99473df4c98eb9 https://github.com/phpmyadmin/phpmyadmin/commit/bf55d536adca6d82bee288a91d9… Author: Dan Ungureanu <udan1107(a)gmail.com> Date: 2015-06-22 (Mon, 22 Jun 2015) Changed paths: M libraries/tbl_columns_definition_form.inc.php M templates/columns_definitions/column_attribute.phtml M templates/columns_definitions/column_attributes.phtml Log Message: ----------- Remove dead code. Following commit fd77f8d. Signed-off-by: Dan Ungureanu <udan1107(a)gmail.com> Commit: 456ec1c796f0241b2e8f5dc90f73052976670757 https://github.com/phpmyadmin/phpmyadmin/commit/456ec1c796f0241b2e8f5dc90f7… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M libraries/tbl_columns_definition_form.inc.php M templates/columns_definitions/column_attribute.phtml M templates/columns_definitions/column_attributes.phtml Log Message: ----------- Merge pull request #1755 from udan11/refactor Remove dead code. Following commit fd77f8d. Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f2f8ee18190e...456ec1c796f0

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e8303d: Translated using Weblate (Interlingua)
by Weblate 23 Jun '15

23 Jun '15

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e8303d644b5e04a138f5242150127929e971ab7e https://github.com/phpmyadmin/phpmyadmin/commit/e8303d644b5e04a138f52421501… Author: Giovanni Sora <g.sora(a)tiscali.it> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M po/ia.po Log Message: ----------- Translated using Weblate (Interlingua) Currently translated at 69.5% (2173 of 3125 strings) [CI skip] Commit: 3bbf53e55a0a8ef1856901ecd57bdec416d6ed9f https://github.com/phpmyadmin/phpmyadmin/commit/3bbf53e55a0a8ef1856901ecd57… Author: Domen <mitenem(a)outlook.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M po/sl.po Log Message: ----------- Translated using Weblate (Slovenian) Currently translated at 99.9% (3122 of 3125 strings) [CI skip] Commit: bd560181026ce902596227096363e3442351a87e https://github.com/phpmyadmin/phpmyadmin/commit/bd560181026ce90259622709636… Author: Franco <fulanodetal.github(a)openaliasbox.org> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 97.9% (3060 of 3125 strings) [CI skip] Commit: c9989c792e582727f32b9d15172e9d5f009c5a3d https://github.com/phpmyadmin/phpmyadmin/commit/c9989c792e582727f32b9d15172… Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M po/tr.po Log Message: ----------- Translated using Weblate (Turkish) Currently translated at 100.0% (3125 of 3125 strings) [CI skip] Commit: f2f8ee18190efbb15853bbd11c3bacd5f3af4d05 https://github.com/phpmyadmin/phpmyadmin/commit/f2f8ee18190efbb15853bbd11c3… Author: Weblate <noreply(a)weblate.org> Date: 2015-06-23 (Tue, 23 Jun 2015) Changed paths: M export.php M js/export.js M libraries/display_export.lib.php M libraries/export.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b310c3dc88e...f2f8ee18190e

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2015