Commit Graph

372 Commits

Author SHA1 Message Date
Madhura Jayaratne
f65ac8803e Merge branch 'QA_4_1' 2014-02-08 13:06:10 +05:30
Madhura Jayaratne
59e3c9474a bug #4278 reCaptcha re-login requires double effort
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-08 13:04:32 +05:30
Marc Delisle
cd998a4c62 Merge pull request #892 from Chanaka/rfe-1403
rfe-1403 : Support for export only triggers/stored procedures
2014-02-07 07:57:48 -05:00
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-06 23:03:04 +05:30
Viduranga Wijesooriya
4c1b38ddf2 fixed loosing of auto increment value when exporting sql
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-05 17:26:19 +05:30
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-02-04 22:47:00 +05:30
Viduranga Wijesooriya
641fa53789 fixed #4261 Export bug
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-02-04 19:03:46 +05:30
Marc Delisle
f5ba57c290 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733"
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-03 10:11:44 -05:00
Marc Delisle
c406599995 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733"
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-03 10:10:53 -05:00
Marc Delisle
464616c26b Merge commit '36e544c' 2014-02-03 08:44:37 -05:00
Marc Delisle
36e544ce9e Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-02-03 08:42:39 -05:00
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
c6969bfb9e Properly encode & in URL
Signed-off-by: Michal Čihař <mcihar@suse.cz>
2014-02-03 09:00:05 +01:00
Madhura Jayaratne
a5c6f555f9 Merge branch 'QA_4_1' 2014-02-02 22:56:55 +05:30
Madhura Jayaratne
22c851d1b8 bug #4259 reCaptcha sound session expired problem
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-02 22:53:11 +05:30
Madhura Jayaratne
fc34716720 reCaptcha theme 'while' matches better with PMA themes
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-02 22:22:53 +05:30
Madhura Jayaratne
d1af87b7e6 Merge branch 'QA_4_1' 2014-02-02 22:18:49 +05:30
Madhura Jayaratne
6a7d3f9ed7 bug #4260 reCaptcha is ignoring language settings
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-02-02 22:15:56 +05:30
Michal Čihař
b4d03dc9f5 Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:30:39 +01:00
Michal Čihař
0b008c44fa Correct punctuation for error messages 2014-02-02 11:19:15 +01:00
Marc Delisle
a8277b944f Merge pull request #881 from Chanaka/rfe-1483
rfe-1483 : Export database without triggers
2014-01-29 09:46:57 -08:00
Michal Čihař
1d76d52baf Missing punctuation at the end of sentences 2014-01-29 15:21:02 +01:00
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Madhura Jayaratne
16587a8c6b Suffix files containing classes with .class.php file extension
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-22 18:19:48 +05:30
Marc Delisle
eb4593c492 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-16 10:32:24 -05:00
Marc Delisle
eebcb9c531 Fix regexp and add explanation
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-16 10:31:25 -05:00
Viduranga Wijesooriya
d5a3b01f77 fixed #4235 Copy table causes SQL error
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-16 14:50:31 +05:30
Marc Delisle
fd15323459 Merge pull request #850 from vpowerrc/viduranga
fixed error #1004 Create indexes at the end in SQL export
2014-01-11 05:04:56 -08:00
Viduranga Wijesooriya
abc11aa8d8 fixed error #1004 Create indexes at the end in SQL export
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-11 17:54:29 +05:30
Marc Delisle
3b89a4650a Fix typos
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-11 07:23:53 -05:00
Marc Delisle
c880e25122 Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-10 16:46:23 -05:00
Marc Delisle
8357558f56 There is only one AUTO_INCREMENT per table
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-10 16:38:55 -05:00
Marc Delisle
5cce4dbae4 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-10 16:36:37 -05:00
Viduranga Wijesooriya
8cf74b688d added #1004 Create indexes at the end in SQL export
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
2014-01-11 02:27:40 +05:30
Hugues Peccatte
ae0c9218ce PHPDoc update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-09 20:51:40 +01:00
Madhura Jayaratne
74aebe629b Spaces around . operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 18:06:02 +05:30
Madhura Jayaratne
84e9ce4946 Spaces around . operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-08 17:26:27 +05:30
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 22:13:10 +01:00
Hugues Peccatte
d27076392c Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 20:44:12 +01:00
Hugues Peccatte
20ab7112bb Fix PHPCS errors/warnings from Jenkins.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-10 21:57:17 +01:00
Hugues Peccatte
2274453717 Minor PHPDoc modifications. 2013-12-07 19:00:53 +01:00
Marc Delisle
bb9d07e0b8 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-06 08:06:37 -05:00
Marc Delisle
4f612de31d Remove unneeded transformation
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-06 06:31:47 -05:00
Rob Lewis
ab22ae90e9 rfe #1474 Text transformation combines Append and Prepend
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-06 06:13:06 -05:00
Marc Delisle
b7d8bd7dea - Fix coding style
- Add ChangeLog entry
2013-12-03 12:47:45 -05:00
Rob Lewis
196b720b7d RFE #1473 Transformation to convert Boolean value to text 2013-12-03 12:40:57 -05:00
Marc Delisle
7411185bd6 Fix coding style 2013-12-03 06:18:14 -05:00
Marc Delisle
1615fe1180 We now use gettext 2013-11-22 12:59:51 -05:00
Marc Delisle
9ad4e64719 Fix coding style 2013-11-22 05:26:45 -05:00
Marc Delisle
ca053deb24 Merge pull request #765 from slimtim/bug_4153
When importing a SQL file convert \r line-endings to \n
2013-11-21 04:16:11 -08:00