webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
90,746 Commits 12 Branches 481 Tags
ff34105afaaa1165ea0708d2c2320daef02fcefe
Commit Graph

389 Commits

Author SHA1 Message Date
Hugues Peccatte
3f546b010d PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 15:52:00 +01:00
Hugues Peccatte
c38b78defb PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 11:46:16 +01:00
Hugues Peccatte
9b1f025fb7 PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-14 23:06:46 +01:00
Hugues Peccatte
db23a9bf8a PHPCS and PHPdoc updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-13 21:40:39 +01:00
Marc Delisle
8e066c5105 Merge branch 'QA_4_1' 2014-03-09 07:41:14 -04:00
Marc Delisle
5fdb93de0a Fix comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-09 07:40:33 -04:00
Dhananjay Nakrani
76c57710f0 Display session expiry msg after auto-redirect. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-03-03 11:49:17 +05:30
Marc Delisle
b50ed1aac4 Merge commit '65e24c0' 2014-03-02 09:41:02 -05:00
Marc Delisle
8c795aede7 Merge commit '089b382' 2014-03-02 09:40:49 -05:00
Chirayu Chiripal
dec30ffd6d Feature Request #1460 Redirect to login page after session has expired 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-02-27 17:45:46 +05:30
Smita Kumari
65e24c0b0a bug fix #4298: added javascript allow just one character if first character is not escape character else allow two including escape character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-27 00:21:03 +05:30
Smita Kumari
089b382e22 bug fix #4298:ImportCSV options UI validation includes "Columns separated with" allows string while "Columns enclosed with" and "Columns escaped with" allow to enter just one character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 19:32:31 +05:30
Marc Delisle
d30b1d314d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-26 07:33:52 -05:00
Smita Kumari
a8052ee602 adding explanation to parameter names 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 17:19:56 +05:30
Smita Kumari
6f095c8a3c Feature Request #1418, added new function docblock 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 00:12:19 +05:30
Marc Delisle
e08c4449e6 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:38:54 -05:00
Smita Kumari
66952d75b1 Implemented Feature request #1418: using string as Column_Sepearted_With parameter 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:26:47 -05:00
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