gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,363 Commits 12 Branches 481 Tags 2.4 GiB
43bb8c11af
Commit Graph

96363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
43bb8c11af Merge branch 'QA_4_3' 2014-12-04 13:18:45 +01:00
Michal Čihař
07c4e4cae4 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-04 13:18:38 +01:00
Michal Čihař
dc81ab1b3b Merge branch 'QA_4_2' into MAINT_4_3_0 2014-12-04 13:18:28 +01:00
Michal Čihař
63c5e674cc Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 13:18:16 +01:00
Michal Čihař
996e7314a8 Cache composer cache 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	.travis.yml

Conflicts:
	.travis.yml
 2014-12-04 13:18:06 +01:00
Michal Čihař
642e5795e2 Merge branch 'QA_4_3' 2014-12-04 10:48:51 +01:00
Michal Čihař
a649ebadc2 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-04 10:48:32 +01:00
Michal Čihař
7ecdaa2fd2 Merge branch 'QA_4_2' into MAINT_4_3_0 
Conflicts:
	.travis.yml
 2014-12-04 10:48:25 +01:00
Michal Čihař
0bf779c61c Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:47:53 +01:00
Michal Čihař
e4a933de8f Do not let coveralls fail the build 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:47:46 +01:00
Michal Čihař
6e9e9cc472 Merge branch 'QA_4_3' 
Conflicts:
	scripts/generate-mo
 2014-12-04 10:34:33 +01:00
Michal Čihař
d19fe59438 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-04 10:33:57 +01:00
Michal Čihař
7e4baefbf0 Merge branch 'QA_4_2' into MAINT_4_3_0 2014-12-04 10:33:48 +01:00
Michal Čihař
5bd1aca4aa Merge commit 'c2ad99da2bf166de7e114e1e129ee435c9e23756' into MAINT_4_3_0 2014-12-04 10:33:40 +01:00
Michal Čihař
779c318313 Merge commit '942f366e71605bb423d786523ad086396cf62afb' into MAINT_4_3_0 2014-12-04 10:33:06 +01:00
Michal Čihař
357bd55571 Merge commit 'e9e3998949adbacf82b90e9d2061bf56e609a373' into MAINT_4_3_0 2014-12-04 10:32:56 +01:00
Michal Čihař
67cade9d80 Merge commit '19802ca9f9cb12c3dd9034a0928f2c417bf91d30' into MAINT_4_3_0 2014-12-04 10:31:50 +01:00
Michal Čihař
c4ffccd6e2 Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:30:29 +01:00
Michal Čihař
f5a99f5a63 Improve locales compiling 
- return correct error code on failure
- try to compile all locales and report error for each failing
- color error messages

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:29:46 +01:00
Michal Čihař
c2ad99da2b Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:21:17 +01:00
Michal Čihař
7a41a4f325 Fix syntax errors in po files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:21:11 +01:00
Michal Čihař
f8ed8422e6 Revert "Adjust plurals equation" 
This reverts commit 72d2741f37.
 2014-12-04 10:19:44 +01:00
Michal Čihař
053cd73031 Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:12:35 +01:00
Michal Čihař
d7b0f0d4f9 Install phpunit using composer 
The pear channel is now disabled so our test fail.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:12:05 +01:00
Michal Čihař
88cd689346 Merge branch 'MAINT_4_2_13' into QA_4_2 2014-12-04 10:03:43 +01:00
Michal Čihař
72d2741f37 Adjust plurals equation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 10:03:35 +01:00
Michal Čihař
80daea0abf Merge branch 'QA_4_3' 2014-12-04 09:14:40 +01:00
Michal Čihař
680352b372 Merge branch 'MAINT_4_3_0' into QA_4_3 
Conflicts:
	README
	doc/conf.py
	libraries/Config.class.php
 2014-12-04 09:14:02 +01:00
Michal Čihař
ccc239040f Adjust testcase to new split methods 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
 2014-12-04 09:12:48 +01:00
Michal Čihař
f9dc6be7e6 Add missing call to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 09:12:05 +01:00
Michal Čihař
4ac6b01e17 Merge branch 'MAINT_4_2_13' into QA_4_2 
Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.class.php
 2014-12-04 09:11:36 +01:00
Michal Čihař
f2a4b56afe Add missing call to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 09:09:29 +01:00
Michal Čihař
94952f52da Adjust testcase to new split methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 09:09:26 +01:00
Weblate
49b017cd83 Merge remote-tracking branch 'origin/master' 2014-12-04 08:59:43 +01:00
Akos Eros
c77259e8ab Translated using Weblate (Hungarian) 
Currently translated at 79.4% (2377 of 2991 strings)

[CI skip]
 2014-12-04 08:59:40 +01:00
Madhura Jayaratne
c25da56114 Merge branch 'QA_4_3' 2014-12-04 13:29:19 +05:30
Weblate
6e71f2a72a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-04 08:55:16 +01:00
Akos Eros
1d92e9db87 Translated using Weblate (Hungarian) 
Currently translated at 79.8% (2377 of 2978 strings)

[CI skip]
 2014-12-04 08:55:14 +01:00
Madhura Jayaratne
23f5a860f7 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-04 13:25:04 +05:30
Madhura Jayaratne
2895f6743a Cursor type 'move' wouldn't be appropriate for table headers that sort on click 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 13:21:42 +05:30
Marc Delisle
f69c48b686 Improve HTML 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 12:47:44 -05:00
Marc Delisle
af52584a27 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 12:38:31 -05:00
Marc Delisle
2e72c46ce1 Make message translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 12:37:18 -05:00
Marc Delisle
eb66742475 Merge pull request #1412 from nisargjhaveri/show_all_dropdown 
Show placeholder in number of rows dropdown when showing all
 2014-12-03 12:32:18 -05:00
Nisarg Jhaveri
79a3d04ed5 Show placeholder in number of rows dropdown when showing all 
- Implemented placeholder in dropdown in getDropdown in PMA_Util
- Show 'All' as placeholder when Show all is checked, in "Number of
rows:" dropdown

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-12-03 19:48:54 +05:30
Marc Delisle
cc0c82e2a3 4.3.0-rc2 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:09:50 -05:00
Weblate
83b48f3912 Merge remote-tracking branch 'origin/master' 2014-12-03 15:07:33 +01:00
josep constanti
c01044df31 Translated using Weblate (Catalan) 
Currently translated at 83.4% (2495 of 2991 strings)

[CI skip]
 2014-12-03 15:07:31 +01:00
Marc Delisle
be99b2d845 Merge commit '28d163f' 2014-12-03 09:07:13 -05:00
Marc Delisle
9591205e2c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:06:49 -05:00