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

94786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sevdimali İsa
40c8fa1968 Translated using Weblate (Azerbaijani) 
Currently translated at 46.9% (1389 of 2961)

[ci skip]
 2014-08-15 19:08:36 +02:00
Marc Delisle
83fb0545a8 bug Incorrect link to documentation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-15 13:08:26 -04:00
Nisarg Jhaveri
169e15be81 feature 857: Regex search and replace 
- Implemented basic regex search and replace for tables.
- Added a checkbox to use regex in 'Find and Replace' view.
- Fixed some tests for this feature

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@students.iiit.ac.in>
 2014-08-15 18:26:31 +05:30
Marc Delisle
5f8a73b75a Merge commit 'a223241' 2014-08-14 12:08:54 -04:00
Marc Delisle
1d09ffcbae Merge commit '55d244e' 2014-08-14 12:08:37 -04:00
Marc Delisle
2a9d739af9 Merge commit 'eba4639' 2014-08-14 12:08:26 -04:00
Marc Delisle
8537e1d966 Merge commit '5681db5' 2014-08-14 12:08:12 -04:00
Marc Delisle
a22324185f Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-08-14 12:07:35 -04:00
Marc Delisle
55d244e37b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-14 12:07:15 -04:00
Weblate
eba4639029 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-14 18:05:54 +02:00
Alex Smirnov
25f4c32d27 Translated using Weblate (Ukrainian) 
Currently translated at 91.9% (2544 of 2768)

[ci skip]
 2014-08-14 18:05:52 +02:00
Alex Smirnov
a269dd6388 Translated using Weblate (Russian) 
Currently translated at 99.8% (2763 of 2768)

[ci skip]
 2014-08-14 18:05:49 +02:00
Alecsandru Prună
e0e2895b0a Translated using Weblate (Romanian) 
Currently translated at 58.4% (1619 of 2768)

[ci skip]
 2014-08-14 18:05:47 +02:00
Marc Delisle
a31863c9e3 Merge pull request #1332 from smita786/QA_4_2 
fix bug #4516
 2014-08-14 12:05:41 -04:00
Marc Delisle
76150d6f65 Merge pull request #1331 from smita786/gsoc_automated_normalizaion 
coding style fix
 2014-08-14 11:43:38 -04:00
Marc Delisle
21ab185b4e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-14 11:40:49 -04:00
Smita Kumari
5681db5084 fix bug #4516 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-14 20:55:02 +05:30
Madhura Jayaratne
34c27d23fb Merge pull request #1330 from kb-yashodha/designer 
Designer refactoring
 2014-08-14 19:46:17 +05:30