gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,239 Commits 12 Branches 481 Tags 2.4 GiB
e433d8189b
Commit Graph

850 Commits

Author SHA1 Message Date
Marc Delisle
ceb77ce6d4 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-12 08:28:33 -04:00
Marc Delisle
08790597c7 Merge pull request #1220 from smita786/gsoc_central_columns_list 
security bug fixes
 2014-06-11 08:08:08 -04:00
Smita Kumari
b749a7b1d6 security bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

use existing escapeHtml function

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-11 17:31:36 +05:30
Michal Čihař
6751384d16 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 09:17:47 +02:00
Hugues Peccatte
b95aa6cdfd Remove trailing whitespaces. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-09 16:44:30 +02:00
Marc Delisle
fd2f1919bf Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 15:38:41 -04:00
Marc Delisle
060fb03afb Merge pull request #1206 from smita786/gsoc_central_columns_list 
Using central list of columns : pick a column from central list
 2014-06-07 15:37:42 -04:00
Smita Kumari
294e36bdb6 pick a column from central list 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

small bug fix

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added own style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

not display column name that already exist in tabl

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added search to the pick column dialog

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

check for central columns configuration relation

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

pagination in pick coulumn dialog

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

code cleanup

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix coding style

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-07 22:06:05 +05:30
Marc Delisle
a6547d9693 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 06:40:42 -04:00
Ashutosh Dhundhara
99b9e8d83c RFE#1145: Preview SQL instead of executing it. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-07 00:27:39 +05:30
Marc Delisle
963197cad1 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 09:41:13 +02:00
Marc Delisle
05533da471 Use dot notation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 09:28:16 +02:00
Michal Čihař
fc018d7d88 Declare variable in top scope 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 12:06:25 +02:00
Michal Čihař
99c3bdcbc7 Define variables before using them 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 12:05:45 +02:00
Michal Čihař
c89da4ef39 Define variable in correct scope 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 12:05:03 +02:00
Michal Čihař
d681d77263 Use dot notation for accessing array members 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 19:48:03 +02:00
Michal Čihař
548c1a57d0 Simplify referencing messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:59:17 +02:00
Michal Čihař
5d55cc7d41 Remove not needed empty block 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:57:56 +02:00
Michal Čihař
2ac44bc701 Correct placement of + 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:55:06 +02:00
Marc Delisle
cf924e57f5 Merge commit '64e9287' 2014-04-12 07:28:39 -04:00
Marc Delisle
d6592b5eb2 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:27:53 -04:00
Marc Delisle
64e9287df5 Remove extra comma 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:16:02 -04:00
Ashutosh Dhundhara
6e241b8411 Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed TODO tag from comment in rte.js

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-12 10:40:04 +05:30
Marc Delisle
3e3d7db2c0 Merge pull request #1129 from WhaleWatching/navigation 
Improve Navigation
 2014-04-08 10:15:57 -04:00
Edward Cheng
d74ac17cb4 Improve Navigation 
Signed-off-by: Edward Cheng <c4150221@gmail.com>

Fix bugs.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-04-07 23:32:39 +08:00
Hugues Peccatte
0023381dc5 Merge pull request #1127 from Tithugues/help4319 
Fix undefined max_input_vars.
 2014-04-06 11:45:55 +02:00
Hugues Peccatte
9632ea441b Fix undefined max_input_vars. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-05 21:23:43 +02:00
Ashutosh Dhundhara
28b7b9031c Browser local storage support for Favorite tables feature. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed sync anchor location.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-02 18:20:29 +05:30
Marc Delisle
5c0b5413ca Merge pull request #1119 from Tithugues/help4319 
Add message to warn the user if a form has too many fields.
 2014-03-30 09:40:39 -04:00
Hugues Peccatte
287d08c826 Add message to warn the user if a form has too many fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-29 17:04:42 +01:00
Michal Čihař
ccc195aef1 Merge commit '0850abc8bc9b4fbbf91cf9ef75520163836bbd4f' 2014-03-24 16:10:13 +01:00
Smita Kumari
51d78cbb81 Bug Sqlform:Missing value in the form 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-24 19:54:53 +05:30
Marc Delisle
383ffd5d3d Merge branch 'QA_4_1' 2014-03-16 09:57:52 -04:00
Marc Delisle
b2900f12af bug #4323 QueryWindow ignores CodeMirror 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-16 09:56:22 -04:00
Hugues Peccatte
418a7a8813 JSLint updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 17:43:29 +01:00
Marc Delisle
941fafd71d Merge branch 'QA_4_1' 2014-03-13 10:25:33 -04:00
Aayush Anand
baecb782e5 Fix bug #3991 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-13 10:19:59 -04:00
Atul Pratap Singh
369a9ad625 Timestamp field was not being checked 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-07 23:24:38 +05:30
Atul Pratap Singh
872e4d039b Merge branch 'QA_4_1' 2014-03-03 01:33:29 +05:30
Atul Pratap Singh
54ee8faa96 Fix error reports 974/1833: cannot call method on tooltip 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-01 23:36:45 +05:30
Edward Cheng
9ba932077e Fix jqplot display 
Add clearfloat before jqplot element.
Fix bug: legend overflow.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-27 22:28:05 +08:00
Marc Delisle
9ce1d34751 Merge commit '1b4908a' 2014-02-21 12:27:51 -05:00
minhaz
1b4908abac Replication of bug #4292 in inline sql edit 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-02-20 21:50:16 +05:30
Michal Čihař
bb69b9162e Add missing semicolon 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-17 19:37:36 +01:00
Marc Delisle
ae163e4d67 Merge commit '2453a15' 2014-02-03 12:30:23 -05:00
Viduranga Wijesooriya
2453a15174 #1498 Add timepicker for 'TIME' type 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-03 09:28:20 +05:30
Marc Delisle
82a549714e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:22:29 -05:00
Marc Delisle
2bca34d2f8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:10:08 -05:00
Atul Pratap Singh
27143a758c Merge branch 'QA_4_1' 2014-01-31 15:25:27 +05:30
Atul Pratap Singh
b7dfae03b9 Fix bug#4266: error_reporting: cannot call methods on widget(tooltip) prior to initialization 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-31 15:18:23 +05:30