Git December 2014

git@phpmyadmin.net

24 participants
453 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bd2a8b: Fix other undefined index notices in PMA_getDiagMe...
by Marc Delisle 04 Dec '14

04 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: bd2a8b501c85d0b04dc018ebe416f9fc9e07fe72 https://github.com/phpmyadmin/phpmyadmin/commit/bd2a8b501c85d0b04dc018ebe41… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M ChangeLog M libraries/relation.lib.php Log Message: ----------- Fix other undefined index notices in PMA_getDiagMessageForFeature() Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5da00d: Run PHP in background
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5da00dc8fe1d7e6eddbffc717cdb57245746004b https://github.com/phpmyadmin/phpmyadmin/commit/5da00dc8fe1d7e6eddbffc717cd… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M test/install-browserstack Log Message: ----------- Run PHP in background Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7dc3a7: Fix runkit caching
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7dc3a76aae298f9f4e2898083abb002cd6e1abc1 https://github.com/phpmyadmin/phpmyadmin/commit/7dc3a76aae298f9f4e2898083ab… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M test/install-runkit Log Message: ----------- Fix runkit caching Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 084458720dc70d89c0f48f162a9cbb280de921a7 https://github.com/phpmyadmin/phpmyadmin/commit/084458720dc70d89c0f48f162a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M test/install-browserstack Log Message: ----------- Fail on exit Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6596f1e5f7a1...084458720dc7

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9bfb7d: Better implementation of placeholder in dropdowns
by Marc Delisle 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9bfb7dd35bf05e65bda790f5a8bb23af785f55e8 https://github.com/phpmyadmin/phpmyadmin/commit/9bfb7dd35bf05e65bda790f5a8b… Author: Nisarg Jhaveri <nisargjhaveri(a)gmail.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M libraries/Util.class.php Log Message: ----------- Better implementation of placeholder in dropdowns If something else is selected, show placeholder as disabled option. Previously it was ignoring `$active_choice` if placeholder is given. Signed-off-by: Nisarg Jhaveri <nisargjhaveri(a)gmail.com> Commit: 6596f1e5f7a1653a8a87467be4e44824d18c7c05 https://github.com/phpmyadmin/phpmyadmin/commit/6596f1e5f7a1653a8a87467be4e… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M libraries/Util.class.php Log Message: ----------- Merge pull request #1413 from nisargjhaveri/dropdown_placeholder Better implementation of placeholder in dropdowns Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d6559c9c5748...6596f1e5f7a1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b43023: Move browserstack setup to external script
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b4302373e611efaf3333337069dee5f1c892036e https://github.com/phpmyadmin/phpmyadmin/commit/b4302373e611efaf3333337069d… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml A test/install-browserstack Log Message: ----------- Move browserstack setup to external script It makes it easier to manage and measure. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: e3ddf2ddebeb1166a6e6cd9af29fcffc8cdf2f9a https://github.com/phpmyadmin/phpmyadmin/commit/e3ddf2ddebeb1166a6e6cd9af29… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml M test/install-browserstack Log Message: ----------- Cache browserstack download Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: a4c2afaf45f12a1d5f2bf1a39db2bd1ed8acf38b https://github.com/phpmyadmin/phpmyadmin/commit/a4c2afaf45f12a1d5f2bf1a39db… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M test/install-runkit Log Message: ----------- Directly clone correct runkit version Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d6559c9c574802d432a6d9163c5f966bb75400ec https://github.com/phpmyadmin/phpmyadmin/commit/d6559c9c574802d432a6d9163c5… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml M test/install-runkit Log Message: ----------- Cache runkit build as well Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bceb08a20426...d6559c9c5748

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bceb08: Fix typo
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bceb08a20426bf060fd6563233955562039814fd https://github.com/phpmyadmin/phpmyadmin/commit/bceb08a20426bf060fd65632339… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Fix typo Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2489ca: Move runkit installation to external script
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2489caebd7e5e3d28e29404bee89422f1fc6b5b9 https://github.com/phpmyadmin/phpmyadmin/commit/2489caebd7e5e3d28e29404bee8… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml A test/install-runkit Log Message: ----------- Move runkit installation to external script This makes easier to read .travis.yml and also allows us to measure time it takes. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4927c4: Set environment in single place
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4927c4e9146793cfba090fad84378b7fb790aeb3 https://github.com/phpmyadmin/phpmyadmin/commit/4927c4e9146793cfba090fad843… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Set environment in single place Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 1ae770ca1ba79cb326415791da364a671d16354b https://github.com/phpmyadmin/phpmyadmin/commit/1ae770ca1ba79cb326415791da3… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Move composer setup to separate phase Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 23c3a2d070f3e85c3d213a251d2cf35832e3a9d0 https://github.com/phpmyadmin/phpmyadmin/commit/23c3a2d070f3e85c3d213a251d2… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Simplify if statements Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f07c5a4a0fedad4009efccc84f9ef26e23146c3f https://github.com/phpmyadmin/phpmyadmin/commit/f07c5a4a0fedad4009efccc84f9… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml M composer.json Log Message: ----------- Install ocular using composer instead of wget Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/43bb8c11afeb...f07c5a4a0fed

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 996e73: Cache composer cache
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 996e7314a877e469ac9a2b288c6bb6eb71d9f933 https://github.com/phpmyadmin/phpmyadmin/commit/996e7314a877e469ac9a2b288c6… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Cache composer cache Signed-off-by: Michal Čihař <michal(a)cihar.com> Conflicts: .travis.yml Conflicts: .travis.yml Commit: 63c5e674cc097b3bc0419ad02894179040732f38 https://github.com/phpmyadmin/phpmyadmin/commit/63c5e674cc097b3bc0419ad0289… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Merge branch 'MAINT_4_2_13' into QA_4_2 Commit: dc81ab1b3b08b1b67a17f6a96a2a93901fe9ac89 https://github.com/phpmyadmin/phpmyadmin/commit/dc81ab1b3b08b1b67a17f6a96a2… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Merge branch 'QA_4_2' into MAINT_4_3_0 Commit: 07c4e4cae4644eb342225b2d9a97c7d160c1496e https://github.com/phpmyadmin/phpmyadmin/commit/07c4e4cae4644eb342225b2d9a9… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Merge branch 'MAINT_4_3_0' into QA_4_3 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a649ebadc246...07c4e4cae464

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 26ce63: Cache composer cache
by Michal Čihař 04 Dec '14

04 Dec '14

Branch: refs/heads/MAINT_4_0_10 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 26ce63dbde1064be68d9956a10204345c446f1b3 https://github.com/phpmyadmin/phpmyadmin/commit/26ce63dbde1064be68d9956a102… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml Log Message: ----------- Cache composer cache Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2014