Git September 2012

git@phpmyadmin.net

24 participants
266 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0791b6: Fix unresolved merge conflict
by Michal Čihař 05 Sep '12

05 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0791b6b5ae04a6b1bb13ef8e32dc07227b7b4c27 https://github.com/phpmyadmin/phpmyadmin/commit/0791b6b5ae04a6b1bb13ef8e32d… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M server_status.php Log Message: ----------- Fix unresolved merge conflict Commit: e9ba7339a7d1043603527ffad2302f3159e8d8d0 https://github.com/phpmyadmin/phpmyadmin/commit/e9ba7339a7d1043603527ffad23… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M server_status.php Log Message: ----------- Coding style improvements Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0a04a561cf6...e9ba7339a7d1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4c601e: Translated using Weblate.
by Weblate 05 Sep '12

05 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4c601eecf898dea99c41d1ae47a1e64128d5e061 https://github.com/phpmyadmin/phpmyadmin/commit/4c601eecf898dea99c41d1ae47a… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: a0a04a561cf6ef9a3a97eb83d6ffebffc5954ff7 https://github.com/phpmyadmin/phpmyadmin/commit/a0a04a561cf6ef9a3a97eb83d6f… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8e8d9a870427...a0a04a561cf6

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1d6a05: Inline control structures are discouraged
by Madhura Jayaratne 05 Sep '12

05 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1d6a054b3c0dfe33a3a39f5bc3497dc00a264ee5 https://github.com/phpmyadmin/phpmyadmin/commit/1d6a054b3c0dfe33a3a39f5bc34… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- Inline control structures are discouraged Commit: c29ee86fbe6f32471149c88dfb81fa665f2a3098 https://github.com/phpmyadmin/phpmyadmin/commit/c29ee86fbe6f32471149c88dfb8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- Wrap some long lines Commit: 60d1d1f4860f352450be30a825da0dd8bcd66e61 https://github.com/phpmyadmin/phpmyadmin/commit/60d1d1f4860f352450be30a825d… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- Spaces for clarity Commit: 8e8d9a870427babc6d1ee24197c3638b09199723 https://github.com/phpmyadmin/phpmyadmin/commit/8e8d9a870427babc6d1ee24197c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- Opening braces of function should be in a new line Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c89b93629da...8e8d9a870427

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] af32d5: Don't limit SunOS memory and swap to the value ran...
by Weblate 04 Sep '12

04 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: af32d57f84a58c46ffd4b08baed322b2620fdcdb https://github.com/phpmyadmin/phpmyadmin/commit/af32d57f84a58c46ffd4b08baed… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- Don't limit SunOS memory and swap to the value range of int Commit: afe2e71aa49281fc43b441ec6f0f2798be7b5973 https://github.com/phpmyadmin/phpmyadmin/commit/afe2e71aa49281fc43b441ec6f0… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: 9b0a4fabb5361905b1550fa667a8ef89dfadfcb6 https://github.com/phpmyadmin/phpmyadmin/commit/9b0a4fabb5361905b1550fa667a… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: e86cdc27479f24f17f5840560ea3a559c71d450d https://github.com/phpmyadmin/phpmyadmin/commit/e86cdc27479f24f17f5840560ea… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: 7f498ac4775f4da0a9f727e708149641364a4457 https://github.com/phpmyadmin/phpmyadmin/commit/7f498ac4775f4da0a9f727e7081… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5f2b0549c449...7f498ac4775f

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5f2b05: Add SolOS bug id to changelog
by J.M 04 Sep '12

04 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5f2b0549c449c74ae8652ab905828832273d7317 https://github.com/phpmyadmin/phpmyadmin/commit/5f2b0549c449c74ae8652ab9058… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog Log Message: ----------- Add SolOS bug id to changelog

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fb4026: Translated using Weblate.
by Weblate 04 Sep '12

04 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fb40264f4797d0a239943d66952689907e6ff1f5 https://github.com/phpmyadmin/phpmyadmin/commit/fb40264f4797d0a239943d66952… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: 5c89b93629da496a8dd4a009ca7d58f65a279512 https://github.com/phpmyadmin/phpmyadmin/commit/5c89b93629da496a8dd4a009ca7… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/78aad3b7f461...5c89b93629da

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5f2b05: Add SolOS bug id to changelog
by J.M 04 Sep '12

04 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5f2b0549c449c74ae8652ab905828832273d7317 https://github.com/phpmyadmin/phpmyadmin/commit/5f2b0549c449c74ae8652ab9058… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog Log Message: ----------- Add SolOS bug id to changelog Commit: 4cb1cfdbe224b5e8e86c0d5e502f58f8ff2e7424 https://github.com/phpmyadmin/phpmyadmin/commit/4cb1cfdbe224b5e8e86c0d5e502… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_3_5' Commit: 78aad3b7f46154376b9c00296ae712f0b688f0f6 https://github.com/phpmyadmin/phpmyadmin/commit/78aad3b7f46154376b9c00296ae… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d15f64c42a82...78aad3b7f461

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8ad5e7: Translated using Weblate.
by Weblate 04 Sep '12

04 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8ad5e72fc888e9a3b35d3f10e280f48b9af1be23 https://github.com/phpmyadmin/phpmyadmin/commit/8ad5e72fc888e9a3b35d3f10e28… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: d15f64c42a82187764a42b7024ec3aae5bb58a3f https://github.com/phpmyadmin/phpmyadmin/commit/d15f64c42a82187764a42b7024e… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/Advisor.class.php M libraries/sysinfo.lib.php M server_status.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/80911671b1c0...d15f64c42a82

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bf5f51: add support for Solaris and FreeBSD system load an...
by J.M 04 Sep '12

04 Sep '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bf5f51bee29584c22a75ed0ec4fec7a9564b92a7 https://github.com/phpmyadmin/phpmyadmin/commit/bf5f51bee29584c22a75ed0ec4f… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog M libraries/Advisor.class.php M libraries/sysinfo.lib.php M server_status.php Log Message: ----------- add support for Solaris and FreeBSD system load and memory display in server status Commit: 60de108cbdf2aa08ab404f63a0968c39857d5b41 https://github.com/phpmyadmin/phpmyadmin/commit/60de108cbdf2aa08ab404f63a09… Author: مترجم حرّ <metehyi(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/ar.po Log Message: ----------- Translated using Weblate. Commit: 3c69bc07f00fdbfade36778fc5cde27b56de57bf https://github.com/phpmyadmin/phpmyadmin/commit/3c69bc07f00fdbfade36778fc5c… Author: Vojislav Pavić <vpavic(a)gmail.com> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate. Commit: ed950a6c1cc2cbc2390ddf65df4935c74f0d2048 https://github.com/phpmyadmin/phpmyadmin/commit/ed950a6c1cc2cbc2390ddf65df4… Author: Weblate <noreply(a)weblate.org> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog M libraries/Advisor.class.php M libraries/sysinfo.lib.php M server_status.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: fed871cd6fd7d03cd8b03d792b93565fcfffd656 https://github.com/phpmyadmin/phpmyadmin/commit/fed871cd6fd7d03cd8b03d792b9… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M libraries/sysinfo.lib.php Log Message: ----------- fix SunOS swap calculation Commit: b136af32921af7767718ddeb38ee45d3a8d6f033 https://github.com/phpmyadmin/phpmyadmin/commit/b136af32921af7767718ddeb38e… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M po/ar.po M po/sr(a)latin.po Log Message: ----------- Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 Commit: 2fce20d69f650535325f71a15a4d8370cc993228 https://github.com/phpmyadmin/phpmyadmin/commit/2fce20d69f650535325f71a15a4… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Add SunOS to status_monitor.js Commit: 80911671b1c028598d8d2ebc36a83fb9d67ecd08 https://github.com/phpmyadmin/phpmyadmin/commit/80911671b1c028598d8d2ebc36a… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M ChangeLog M js/server_status_monitor.js M libraries/Advisor.class.php M libraries/sysinfo.lib.php M server_status.php Log Message: ----------- Merge branch 'QA_3_5' Conflicts: server_status.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0354ea06ad84...80911671b1c0

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 2fce20: Add SunOS to status_monitor.js
by J.M 04 Sep '12

04 Sep '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2fce20d69f650535325f71a15a4d8370cc993228 https://github.com/phpmyadmin/phpmyadmin/commit/2fce20d69f650535325f71a15a4… Author: J.M <me(a)mynetx.net> Date: 2012-09-04 (Tue, 04 Sep 2012) Changed paths: M js/server_status_monitor.js Log Message: ----------- Add SunOS to status_monitor.js

1 0

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git September 2012