gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,012 Commits 12 Branches 481 Tags 2.4 GiB
227878e5dd
Commit Graph

13439 Commits

Author SHA1 Message Date
Marc Delisle
e53f913a34 Merge commit 'a93ad61' 2015-04-08 07:06:13 -04:00
Marc Delisle
a93ad61caa Remove debugging code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-08 07:03:32 -04:00
Madhura Jayaratne
0b57843356 rfe #1651 Allow copying mutiple rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-08 12:52:43 +05:30
Madhura Jayaratne
43797ad8e1 It makes more sense to order by page name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-08 10:25:51 +05:30
Madhura Jayaratne
1c52bc2a81 rfe #1650 Support a default page in designer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-08 10:15:27 +05:30
Marc Delisle
4bf1c166d0 Remove references to the old query window in messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-07 12:54:00 -04:00
Michal Čihař
fd5cdbaab0 Merge commit '25a05bd6c81e0b938586e22e4a5eb229df99b01e' 2015-04-07 15:21:04 +02:00
Madhura Jayaratne
25a05bd6c8 MIME Transformation link fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 18:08:43 +05:30
Marc Delisle
6ab95d9bec 4.4.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-07 08:05:15 -04:00
Madhura Jayaratne
8af521f550 Merge branch 'QA_4_4' 2015-04-07 10:28:38 +05:30
Madhura Jayaratne
7c4d8b55e4 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 10:24:45 +05:30
Madhura Jayaratne
63570bc30f bug #4841 Status page: Mislukte pogingen per uur value is incorrect 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 10:20:12 +05:30
Marc Delisle
eb7d05cdfe Merge commit 'a79f4a6' 2015-04-06 07:28:09 -04:00
Dan Ungureanu
a79f4a6e6b BUG #4839. Wrong documentation link. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-06 13:26:50 +03:00
Marc Delisle
285d7cd594 Merge pull request #1633 from whitepiegon/masterFeature2 
additional feature for form validation
 2015-04-05 16:57:29 -04:00
Aayush Anand
053ca6029e additional feature for form validation 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2015-04-05 21:39:40 +05:30
Marc Delisle
708736ab17 Merge pull request #1622 from whitepiegon/masterFeature2 
#763 jquery validation feature
 2015-04-05 05:09:32 -04:00
Aayush Anand
30ba4c3cd7 Feature 763 jquery validation feature squashed 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2015-04-04 21:10:06 +05:30
Madhura Jayaratne
950d4ff3c2 Merge branch 'QA_4_4' 2015-04-03 18:54:55 +05:30
Madhura Jayaratne
c5260bb56d bug #4836 Server warning after moving from console to direct clicks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 18:53:31 +05:30
Marc Delisle
14941285b9 4.4.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 07:27:13 -04:00
Madhura Jayaratne
07220f81fe Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-03 15:36:41 +05:30
Madhura Jayaratne
8b1cbaf988 rfe #1635 Have ZeroConf create phpmyadmin DB if possible 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 15:32:36 +05:30
Marc Delisle
1353a79720 Respect our message style (second attempt) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:47:10 -04:00
Marc Delisle
e54133575c Revert "Respect our message style" 
This reverts commit 5b768a115d.
 2015-04-03 05:43:23 -04:00
Marc Delisle
5b768a115d Respect our message style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:40:03 -04:00
Madhura Jayaratne
927b95bc23 Merge branch 'QA_4_4' 2015-04-03 12:29:43 +05:30
Madhura Jayaratne
744e9f42e4 bug #4834 Do not attach token to css requests to improve caching 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 12:28:50 +05:30
Madhura Jayaratne
dc07fb8b3b Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 10:29:18 +05:30
Madhura Jayaratne
7b16d62d09 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 10:27:07 +05:30
Madhura Jayaratne
8d8a90288a bug #4832 Sorting distinct values result loses links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 10:25:29 +05:30
Marc Delisle
f9d76e39e0 Merge branch 'QA_4_4' 2015-04-02 16:11:25 -04:00
Marc Delisle
8d16b2d937 bug #4822 Compress when php.ini output_buffering is active 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-02 16:10:34 -04:00
Marc Delisle
ca652921bb Merge pull request #1627 from whitepiegon/masterFeature1 
feature 844 structure in PDF export
 2015-04-02 15:34:58 -04:00
Aayush Anand
4b9ef9a757 feature 844 structure in PDF export squashed 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2015-04-03 00:51:33 +05:30
Madhura Jayaratne
96c4bd58d2 Merge branch 'QA_4_4' 2015-04-02 22:50:44 +05:30
Madhura Jayaratne
8f1700d1eb Add additional allowed urls for recaptcha 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 22:48:44 +05:30
Madhura Jayaratne
1a2fee8fbb Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:06:48 +05:30
Madhura Jayaratne
57e21caab1 bug #4828 JavaScript is loaded in wrong order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:01:23 +05:30
Marc Delisle
2e381cb248 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-01 11:19:11 -04:00
Marc Delisle
ddeb39bcf8 Merge branch 'QA_4_4' 2015-04-01 08:10:55 -04:00
pratiksethia1
040d3d294d additional change 
Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
 2015-04-01 08:07:54 -04:00
pratiksethia1
e2617c5868 bug#4824 innodb status page empty 
Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
 2015-04-01 08:07:27 -04:00
Madhura Jayaratne
6f307e5db1 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-01 12:35:16 +05:30
Madhura Jayaratne
d36ac0c411 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-31 19:39:14 +05:30
Madhura Jayaratne
720565ef22 Select local file import option in subsequent submissions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-31 19:38:09 +05:30
Marc Delisle
e359257303 Merge branch 'QA_4_4' 2015-03-31 10:02:10 -04:00
Madhura Jayaratne
0f720c5375 bug #4754 pMA DB not detected properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-31 18:52:38 +05:30
Marc Delisle
c8ca80d1c4 Performance: do not compute the count on each iteration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-30 13:47:17 -04:00
Marc Delisle
18a085f6ac Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-30 13:23:33 -04:00