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

2335 Commits

Author SHA1 Message Date
Madhura Jayaratne
15caf48a9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-20 13:54:02 +05:30
Madhura Jayaratne
0d109ac824 This is only a output transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 13:52:03 +05:30
Marc Delisle
ed27666193 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-18 06:28:21 -04:00
Madhura Jayaratne
33c4f54618 Fix unit tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 15:05:17 +05:30
Marc Delisle
1ad1a3846b Merge branch 'QA_4_4' 2015-04-15 12:17:58 -04:00
Marc Delisle
77369e5e2b Bug PHP 7 compatibility in php-gettext 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 11:32:31 -04:00
Marc Delisle
965075452a Merge commit '0acbf99' 2015-04-14 13:29:43 -04:00
Marc Delisle
0acbf99549 Fix unit tests for Cloudflare support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:27:08 -04:00
Marc Delisle
51f317690e Merge pull request #1644 from udan11/patch_1 
Old MySQL extension is not available in newer PHP versions.
 2015-04-13 15:13:24 -04:00
Dan Ungureanu
8cc3a7635c Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-13 21:58:44 +03:00
Madhura Jayaratne
15e5c3d9f7 Do not use globals 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 19:23:52 +05:30
Madhura Jayaratne
2b1b872f63 Fix SQL export related tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:45:04 +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
106632bd66 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-07 15:12:49 -04:00
Michal ฤŒihaล™
2ec230bc18 Fix patch download 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-04-07 15:19:46 +02:00
Michal ฤŒihaล™
b73103e5e6 Disable SSL certificate check on patch download 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-04-07 13:18:31 +02:00
Michal ฤŒihaล™
8a58e020e5 Adjust patch download URL 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-04-07 09:48:09 +02:00
Michal ฤŒihaล™
798b772ded Disable xdebug profiler 
Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-04-07 09:05:48 +02: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
Marc Delisle
2e381cb248 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-01 11:19:11 -04:00
Madhura Jayaratne
c06c23f560 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:24:00 +05:30
Michal ฤŒihaล™
b249614d06 Merge native and multibyte tests 
Having in all cases dozen of skipped test just makes the results
readability worse. So it makes little sense unless we can figure out way
to test both implementations.

Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-03-27 08:44:39 +01:00
Marc Delisle
96c627101c Remove extraneous code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:29:06 -04:00
Marc Delisle
103d226016 Merge branch 'QA_4_4' 2015-03-24 13:28:08 -04:00
Marc Delisle
40406c5e7e bug #4813 MySQL 5.7.6 and the Users menu tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:26:51 -04:00
Marc Delisle
96a98e9035 Adapt translations to colon removal 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 12:07:28 -04:00
Madhura Jayaratne
c74b37a5f5 Unit tests for PMA_resultSetHasJustOneTable() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 20:41:18 +05:30
Smita Kumari
2a0c5f2082 added unit tests for multi-edit on central colums page plus coding style fix 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-03-23 10:14:49 +05:30
Marc Delisle
d9fdf6b9aa Fix unit test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-19 12:42:29 -04:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master 
Fix Feature#1609- Lock page navigation when entering data.
 2015-03-15 06:52:28 -04:00
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data. 
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-14 22:07:44 +05:30
Marc Delisle
7714e86e74 Merge pull request #1563 from madhuracj/rfe1561 
Per server iv
 2015-03-13 12:21:19 -04:00
Madhura Jayaratne
ceb833c545 Fix failing test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 17:57:16 +05:30
Madhura Jayaratne
d162f4f3bd Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 15:32:46 +05:30
Madhura Jayaratne
635b830892 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 20:07:21 +05:30
Madhura Jayaratne
6952bd36c2 Fix testPMASyncUniqueColumns() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:57:54 +05:30
Madhura Jayaratne
d6a36ef770 Fix testPMAGetHTMLforColumnDropdown() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:43:40 +05:30
Madhura Jayaratne
7ece631025 Fix testPMAFindExistingColNames() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:41:12 +05:30
Madhura Jayaratne
4c2365e48c Fix testPMAGetCentralColumnsListRaw() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:35:32 +05:30
Madhura Jayaratne
fd16be9859 Fix testPMAGetCentralColumnsFromTable() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:27:13 +05:30
Madhura Jayaratne
b6724c5cf6 Cleanup duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:11:03 +05:30
Madhura Jayaratne
5e8d081869 Fix testPMADeleteColumnsFromList() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 19:01:43 +05:30
Madhura Jayaratne
19a1f376f5 Fix testPMAGetCentralColumnsCount() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 18:25:44 +05:30
Madhura Jayaratne
a90b8bc8e2 Move test data to instance variable with reuse in mind 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 18:15:25 +05:30
Madhura Jayaratne
547606bd26 Fix testPMAGetColumnsList() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 18:03:05 +05:30
Madhura Jayaratne
d912798fd0 These are not generic expectations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 17:33:12 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30