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

96074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
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ř
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
Marc Delisle
cc0c82e2a3 4.3.0-rc2 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:09:50 -05:00
Marc Delisle
20d0f08c58 Deactivate this test for now 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:00:45 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:50:14 -05:00
Michal Čihař
1daa32fb97 bug #4612 [security] XSS vulnerability in redirection mechanism 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:29:55 -05:00
Marc Delisle
a59ef66497 4.2.13.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:13:36 -05:00
Madhura Jayaratne
1ac863c757 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 21:20:59 +05:30
Michal Čihař
9b2479b721 bug #4612 [security] XSS vulnerability in redirection mechanism 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 21:51:59 +05:30
Marc Delisle
e9e3998949 4.2.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-30 06:41:57 -05:00
Marc Delisle
41277d1887 4.2.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-30 06:35:21 -05:00
Marc Delisle
942f366e71 4.2.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-30 06:32:49 -05:00
Marc Delisle
0ab3ee3728 4.3.0-rc1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-27 09:32:24 -05:00
Madhura Jayaratne
19802ca9f9 bug #4608 SELECT permission issues with relations and restricted access 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 10:25:42 +05:30
Marc Delisle
e38f5753ff Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 08:12:23 -05:00
Madhura Jayaratne
f5c263119d Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 12:44:09 +05:30
Madhura Jayaratne
9a818c289d bug #4607 Syntax error during db_copy operation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 12:39:09 +05:30
Madhura Jayaratne
57413772c1 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:26:09 +05:30
Madhura Jayaratne
14a77261d2 bug #4606 Tracking report export as SQL dump does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:21:18 +05:30
Weblate
e2a9605706 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-25 04:45:46 +01:00
Huseyn
762dd0884f Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1582 of 2978 strings)

[CI skip]
 2014-11-25 04:45:45 +01:00
Madhura Jayaratne
0fda8293f4 Merge branch 'QA_4_2' into QA_4_3 2014-11-25 09:15:08 +05:30
Madhura Jayaratne
8607de61e0 bug #4605 Unseen messages in tracking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 09:01:35 +05:30
Sevdimali İsa
aad6456b45 Translated using Weblate (Azerbaijani) 
Currently translated at 53.0% (1581 of 2978 strings)

[CI skip]
 2014-11-24 14:57:41 +01:00
Marc Delisle
ed6ba4210f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:10:08 -05:00
Marc Delisle
0489e3248d Merge commit '783e28f' into QA_4_3 2014-11-22 09:09:32 -05:00
Marc Delisle
9af3635c26 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:09:18 -05:00
Marc Delisle
02fcb6e746 Add FAQ reference 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:04:11 -05:00
Marc Delisle
783e28f160 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-22 09:02:53 -05:00
Weblate
42bf15ea70 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-22 13:17:54 +01:00