gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,804 Commits 12 Branches 481 Tags 2.4 GiB
440fddd85e
Commit Graph

94804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
440fddd85e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-08-17 12:50:04 -04:00
Marc Delisle
0927941195 Merge commit 'f47eaae' 2014-08-17 12:49:47 -04:00
Weblate
8faf31cba0 Merge remote-tracking branch 'origin/master' 2014-08-17 18:48:50 +02:00
Alex Smirnov
756e7a00e8 Translated using Weblate (Ukrainian) 
Currently translated at 88.2% (2617 of 2965)

[ci skip]
 2014-08-17 18:48:46 +02:00
Alecsandru Prună
ba7a744dc8 Translated using Weblate (Romanian) 
Currently translated at 60.6% (1797 of 2965)

[ci skip]
 2014-08-17 18:48:43 +02:00
Panagiotis Papazoglou
3c4ad5d52b Translated using Weblate (Greek) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-17 18:48:40 +02:00
Marc Delisle
8ee9b58d90 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:48:09 -04:00
Marc Delisle
38b8cd7a80 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 12:40:53 -04:00
Marc Delisle
0c7702518b Merge commit '773c507' 2014-08-17 12:40:01 -04:00
Weblate
f47eaae742 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-17 15:48:26 +02:00
Alex Smirnov
03cdd61096 Translated using Weblate (Ukrainian) 
Currently translated at 95.7% (2651 of 2768)

[ci skip]
 2014-08-17 15:48:23 +02:00
Burak Yavuz
0b92a3d64d Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-08-17 15:48:20 +02:00
Alecsandru Prună
f7be3ba54b Translated using Weblate (Romanian) 
Currently translated at 61.5% (1704 of 2768)

[ci skip]
 2014-08-17 15:48:17 +02:00
Sevdimali İsa
052cd954ac Translated using Weblate (Azerbaijani) 
Currently translated at 47.6% (1319 of 2768)

[ci skip]
 2014-08-17 15:48:14 +02:00
Marc Delisle
e0043d959e Merge commit '7f977f4' into QA_4_2 2014-08-17 09:47:51 -04:00
Marc Delisle
30ffae63cf Merge commit '3ffc967' into QA_4_2 2014-08-17 09:46:21 -04:00
Marc Delisle
cfc1e45510 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 09:45:39 -04:00
Marc Delisle
6c9d6a96be Merge commit '773c507' into QA_4_2 2014-08-17 09:44:06 -04:00
Marc Delisle
7f977f4633 4.2.7.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:56:43 -04:00
Madhura Jayaratne
3ffc967fb6 bug #4517 [security] XSS in relation view 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:54:05 -04:00
Madhura Jayaratne
90ddeecf60 bug #4504 [security] Self-XSS in query charts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:52:05 -04:00
Madhura Jayaratne
cd9f302bf7 bug #4503 [security] Self-XSSes in monitor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:50:27 -04:00
Madhura Jayaratne
2c45d7caa6 bug #4502 [security] Self-XSS in enum value editor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:47:53 -04:00
Madhura Jayaratne
647c9d12e3 bug #4501 [security] XSS in table browse page 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:45:10 -04:00
Madhura Jayaratne
0cd293f5e1 bug #4505 [security] XSS in view operations page 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-17 08:41:57 -04:00
Burak Yavuz
0d8c331a97 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-16 22:58:49 +02:00
Matías Bellone
aa326cb015 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-16 22:40:22 +02:00
Panagiotis Papazoglou
c8522ca8f4 Translated using Weblate (Greek) 
Currently translated at 100.0% (2965 of 2965)

[ci skip]
 2014-08-16 20:58:45 +02:00
Marc Delisle
8551a4dc80 Update po files 2014-08-16 14:26:46 -04:00
Marc Delisle
5818cd807e Remove trailing whitespace 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 14:24:41 -04:00
Marc Delisle
f1c5ec25c7 Merge pull request #1336 from Chanaka/RFE-1521 
rfe-1521 : Add confirmation, when delete user
 2014-08-16 14:21:41 -04:00
Chanaka Dharmarathna
32daae2b03 rfe-1521 : Add confirmation, when delete user 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-08-16 23:20:56 +05:30
Alecsandru Prună
41c0fb56ed Translated using Weblate (Romanian) 
Currently translated at 60.1% (1784 of 2964)

[ci skip]
 2014-08-16 17:09:31 +02:00
Marc Delisle
51c005eb5c Translated using Weblate (French) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-16 17:09:13 +02:00
Matías Bellone
dda6b35ae2 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-16 16:33:06 +02:00
Domen
0eb97a7fb1 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-16 15:59:04 +02:00
Burak Yavuz
21a0100292 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-08-16 15:37:49 +02:00
Weblate
75a7f0f979 Merge remote-tracking branch 'origin/master' 2014-08-16 15:20:30 +02:00
Alecsandru Prună
b574fff77c Translated using Weblate (Romanian) 
Currently translated at 57.7% (1713 of 2964)

[ci skip]
 2014-08-16 15:20:26 +02:00
Marc Delisle
5c7c5ba533 Remove old tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 09:20:15 -04:00
Marc Delisle
f8634bb1bb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 08:44:40 -04:00
Marc Delisle
59d660d30d Unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 08:40:28 -04:00
Marc Delisle
dc829aa572 Update po files 2014-08-16 07:49:15 -04:00
Marc Delisle
55172314b2 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 07:48:49 -04:00
Marc Delisle
b3e002c5e4 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 07:31:40 -04:00
Marc Delisle
7be74bf634 Merge pull request #1334 from nisargjhaveri/feature_857 
feature 857: Regex search and replace
 2014-08-16 07:30:29 -04:00
Marc Delisle
c274c376f4 Update po files 2014-08-16 07:07:26 -04:00
Marc Delisle
b7cec730f3 Improve message and make it translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 07:06:51 -04:00
Weblate
e513c4fce8 Merge remote-tracking branch 'origin/master' 2014-08-15 19:08:42 +02:00
Alecsandru Prună
f0909e2aeb Translated using Weblate (Romanian) 
Currently translated at 57.3% (1699 of 2961)

[ci skip]
 2014-08-15 19:08:39 +02:00