Commit Graph

100507 Commits

Author SHA1 Message Date
Madhura Jayaratne
7af4664d29 Remove debug code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 10:51:06 +05:30
Madhura Jayaratne
2949be7df0 Declare variable at function scope
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 10:48:17 +05:30
Madhura Jayaratne
25e7671d5d Do not assign on return
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 10:44:32 +05:30
Madhura Jayaratne
6df6be6520 Remove duplicate styles
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 10:41:17 +05:30
Madhura Jayaratne
637de2a14d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 10:32:33 +05:30
Madhura Jayaratne
1b799702f3 'event' is defined but never used.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 10:12:49 +05:30
Atul Pratap Singh
365d0e0316 Merge pull request #1727 from gzzhanghao/refactor
Decompose tbl_*.lib.php scripts
2015-06-18 02:03:25 +05:30
Marc Delisle
4d3ec49d94 Merge pull request #1738 from nijel/release-sign
Add support for GPG signing releases
2015-06-17 14:08:42 -04:00
Isaac Bennetch
69fa764d77 Merge pull request #1739 from devenbansod/1594C
Fixed small error on server_databases.php
2015-06-17 09:28:20 -04:00
Deven Bansod
2dab2b34e2 Fixed small error
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-17 23:58:09 +05:30
Marc Delisle
e8a3bb54b8 Shorter example link to release notes
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-17 09:02:47 -04:00
Marc Delisle
a393a48d40 4.4.10 release date
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-17 08:13:21 -04:00
Marc Delisle
0683fa8ed7 Merge commit '98a3567' 2015-06-17 08:11:15 -04:00
Weblate
98a3567a9a Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-17 14:08:50 +02:00
Tommy Surbakti
afe5e692d2 Translated using Weblate (Indonesian)
Currently translated at 76.1% (2312 of 3035 strings)

[CI skip]
2015-06-17 14:08:47 +02:00
Marc Delisle
22b36e3a13 4.4.11-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-17 08:08:00 -04:00
Madhura Jayaratne
2c0059cb4d Localize action name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 17:00:40 +05:30
Madhura Jayaratne
eff203659b Organize HTML generation code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 16:53:17 +05:30
Madhura Jayaratne
5cff9dd06a Wrap a long line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 16:44:56 +05:30
Madhura Jayaratne
f9e2a6c813 Use same delete icon
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 16:42:48 +05:30
Madhura Jayaratne
e4bedfffa3 Introduce order for order by clause
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 16:41:00 +05:30
Madhura Jayaratne
696aa86e1f Back quote order by columns
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 16:12:08 +05:30
Madhura Jayaratne
c98ae18912 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-17 15:42:08 +05:30
Madhura Jayaratne
ffd828a746 Check the corresponding 'show' checkbox when column is selected
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 15:40:51 +05:30
Weblate
cd9d383cd1 Merge remote-tracking branch 'origin/master' 2015-06-17 08:27:54 +02:00
Tommy Surbakti
8b1b6bca32 Translated using Weblate (Indonesian)
Currently translated at 74.1% (2300 of 3102 strings)

[CI skip]
2015-06-17 08:27:50 +02:00
Madhura Jayaratne
02a32a641a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-17 11:57:26 +05:30
Madhura Jayaratne
45cb8e8e7c Improve comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 11:56:04 +05:30
Madhura Jayaratne
714ab04d51 bug #4795 Query builder: missing joint for the intermediary table
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 11:47:22 +05:30
Madhura Jayaratne
f965893c7b Refactor: Move table JOINing logic to a separate method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:53:39 +05:30
Madhura Jayaratne
fae84aca9a Refactor: move to a new method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:45:19 +05:30
Madhura Jayaratne
7a4efae405 Better variable names
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:32:15 +05:30
Madhura Jayaratne
2d331942f5 Reduce duplication
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:10:07 +05:30
Hauke Henningsen
957d4af6b4 Translated using Weblate (German)
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
2015-06-17 05:52:55 +02:00
Madhura Jayaratne
099c97c173 Merge pull request #1735 from madhuracj/vqb
Improvements to visual query builder
2015-06-17 09:00:55 +05:30
Madhura Jayaratne
7c12bb64a3 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 08:51:28 +05:30
Madhura Jayaratne
ed357d7716 bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 08:48:14 +05:30
Jason
c24e96f1a3 Optimize logic in tbl_gis_visualization.php
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-06-17 01:50:10 +08:00
Jason
c0b723aa75 Fix trailling space
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-06-17 01:28:11 +08:00
Jason
cb771052c8 Finish refactoring tbl_*.lib.php
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-06-17 01:14:27 +08:00
Madhura Jayaratne
4076c6b15f Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 19:44:02 +05:30
Madhura Jayaratne
bfac73dafd Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-16 19:39:46 +05:30
Madhura Jayaratne
37a40028e3 bug #4955 Clicking on the navi logo does not always work
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 19:39:06 +05:30
Madhura Jayaratne
2c4d25e19b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-16 17:17:13 +05:30
Madhura Jayaratne
ac0d22638d Merge branch 'QA_4_4' 2015-06-16 17:15:59 +05:30
Weblate
5eb853e5f4 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-16 13:42:06 +02:00
Tommy Surbakti
2d13780108 Translated using Weblate (Indonesian)
Currently translated at 74.9% (2275 of 3035 strings)

[CI skip]
2015-06-16 13:42:03 +02:00
Madhura Jayaratne
1d0de9881a bug #4962 Insert by foreign key scrolls page to top
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-16 17:10:13 +05:30
Marc Delisle
aa89456dc4 Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-16 07:17:32 -04:00
Michal Čihař
edda35f603 Add support for GPG signing releases
Signed-off-by: Michal Čihař <michal@cihar.com>
2015-06-16 12:11:06 +02:00