Commit Graph

95924 Commits

Author SHA1 Message Date
Madhura Jayaratne
183aae0c3f rfe #1556 Disabling Show all
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-13 12:42:16 +05:30
Madhura Jayaratne
52596698a7 Prompt to confirm on Show All
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-13 10:53:29 +05:30
Madhura Jayaratne
1a8d705550 Another instance of double question marks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-13 08:36:30 +05:30
Madhura Jayaratne
acdb9dc52e Another instance of double question marks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-13 08:25:19 +05:30
Madhura Jayaratne
5eec427921 Avoid double question marks here
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-13 08:22:31 +05:30
Marc Delisle
4246606798 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-12 08:02:55 -05:00
Josh Kalderimis
e7296971f0 Use the new beta build env on Travis
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-12 07:59:32 -05:00
Madhura Jayaratne
f031099ad6 Update to new PMA_URL_getCommon parameters
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 17:33:37 +05:30
Madhura Jayaratne
c4710c3e1d Avoid notices related to replication
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 17:08:25 +05:30
Madhura Jayaratne
c7a563893b These two should be $server_slave_replication
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 17:02:35 +05:30
Madhura Jayaratne
70a021a210 Avoid notices
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 16:44:14 +05:30
Madhura Jayaratne
a42b441b6e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 15:03:32 +05:30
Madhura Jayaratne
871d811bc7 ChangeLog entry for bug #4585 commit ff5e32553e
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 15:00:42 +05:30
Atul Pratap Singh
41df743274 Merge branch 'QA_4_2' 2014-11-12 14:10:34 +05:30
Atul Pratap Singh
03c89704fa Changelog entry
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-11-12 14:09:35 +05:30
Atul Pratap Singh
d2690886e5 Merge branch 'QA_4_2' 2014-11-12 14:07:52 +05:30
Atul Pratap Singh
d533e98176 Fix bug#4586 Javascript error after moving a column
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-11-12 14:06:49 +05:30
Atul Pratap Singh
7775cc8d31 Fix bug#4586 Javascript error after moving a column
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-11-12 14:02:43 +05:30
Madhura Jayaratne
ff5e32553e Executing multiple SQLs - add missing parameter
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 10:54:44 +05:30
Marc Delisle
3522eaa76e Directly use a POST parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-11 15:47:51 -05:00
Hugues Peccatte
252f585281 Update ChangeLog.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 20:50:14 +01:00
Hugues Peccatte
9c0f01210d Merge pull request #1396 from Tithugues/b4535_master
Fix #4535: notices about replication
2014-11-11 20:47:50 +01:00
Michal ฤŒihaล™
ed579ab84f Improve message
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
2014-11-11 16:37:52 +01:00
Marc Delisle
4ccb8df7ea Merge pull request #1394 from nisargjhaveri/autocomplete
SQL autocomplete in RTE editors
2014-11-11 10:33:31 -05:00
Hugues Peccatte
829a84b46e Refactor replication_info filling.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 16:24:45 +01:00
Madhura Jayaratne
f8d68e6272 Eliminate duplicate code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 20:49:11 +05:30
Hugues Peccatte
8280bb0f9e Manage empty values of slave replication.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 16:12:26 +01:00
Hugues Peccatte
01c514e060 Manage empty values of slave replication.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-11 16:08:40 +01:00
Madhura Jayaratne
6e2b7d9145 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-11 19:59:06 +05:30
Madhura Jayaratne
55be4c8f85 Remove duplicate code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 19:57:12 +05:30
Chanaka Dharmarathna
e83c2f37f0 Removed unused codes
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-11-11 19:06:48 +05:30
Weblate
661744c2b3 Merge remote-tracking branch 'origin/master' 2014-11-11 13:39:40 +01:00
Madhura Jayaratne
4657979741 Translated using Weblate (Sinhala)
Currently translated at 67.5% (2009 of 2976 strings)

[CI skip]
2014-11-11 13:39:38 +01:00
Madhura Jayaratne
ac450e7853 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-11 18:06:15 +05:30
Madhura Jayaratne
b6f0d923b2 More long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 18:01:58 +05:30
Madhura Jayaratne
3c69273829 Wrap long js lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:57:52 +05:30
Madhura Jayaratne
b940264946 Multi byte functions are not needed to match types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:48:08 +05:30
Madhura Jayaratne
8c7e1a0b2c Long lines wrapped
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:46:24 +05:30
Madhura Jayaratne
52e0087b0e Long messages wrapped
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:45:59 +05:30
Hugues Peccatte
6991720ea2 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-11 10:03:07 +01:00
Hugues Peccatte
a0f348beea Merge branch 'removeUnusedVariables_master' 2014-11-11 10:02:54 +01:00
Madhura Jayaratne
3b3bd0c2eb Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:41:56 +05:30
Madhura Jayaratne
1d54c59049 #4584 Edit dialog for routines is too long for smaller displays
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:35:00 +05:30
Madhura Jayaratne
ffcd97aa48 bug #4404 Recordset return from procedure display nothing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:28:58 +05:30
Hugues Peccatte
b61ea0a10c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-10 23:28:33 +01:00
Hugues Peccatte
13b5690bac Fix typo in class name.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-10 23:28:19 +01:00
Hugues Peccatte
a68ea85d4d Remove unused locale variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-10 23:26:57 +01:00
Marc Delisle
bade25f747 Merge pull request #1395 from nisargjhaveri/typoInExport
Fixed typo in SQL export
2014-11-10 15:47:25 -05:00
Nisarg Jhaveri
fb130bf20d Fixed typo in SQL export
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
2014-11-11 00:47:38 +05:30
Nisarg Jhaveri
a4c2cfea87 SQL autocomplete in RTE editors
Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
2014-11-11 00:16:59 +05:30