gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,199 Commits 12 Branches 481 Tags 2.4 GiB
cf3375ba58
Commit Graph

100199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
cf3375ba58 Merge branch 'QA_4_4' 2015-06-04 21:49:32 +05:30
Madhura Jayaratne
ccba5ac67e Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 21:46:05 +05:30
Madhura Jayaratne
a39a5ce265 bug #4942 Export to gzip saves plain text under Chrome 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 21:44:40 +05:30
Madhura Jayaratne
1369057141 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 21:09:40 +05:30
Madhura Jayaratne
37c9eba780 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 21:00:24 +05:30
Madhura Jayaratne
6235c3d8c5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 20:56:03 +05:30
Madhura Jayaratne
4e937d9918 Remove support for Shift + Click on function name to apply to all rows in insert/edit page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 20:54:13 +05:30
Isaac Bennetch
8ca1000223 Changelog for RFE 1359 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-04 09:54:04 -04:00
Isaac Bennetch
b5c946fdb1 Merge pull request #1713 from devenbansod/rfe1359 
RFE#1359 - Ctrl (and alt) Navigation in Grid Editor
 2015-06-04 09:42:11 -04:00
Marc Delisle
1456a3e5b0 Improve variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-04 09:16:46 -04:00
Marc Delisle
32babb3432 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-04 09:12:22 -04:00
Madhura Jayaratne
22c45521e7 Put the parameter array in a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:55:56 +05:30
Madhura Jayaratne
60e43ae164 Parameters should be on a new line in multiline function call 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:51:40 +05:30
Madhura Jayaratne
cb1f28157c Fix more indentation issues 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:45:07 +05:30
Madhura Jayaratne
e2f680f8f7 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:40:13 +05:30
Madhura Jayaratne
cacf74c9b9 Remove superfluous whitespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:34:50 +05:30
Madhura Jayaratne
c37a3d9bb0 Inline control structures are discouraged 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:33:06 +05:30
Madhura Jayaratne
fd7907a041 Opening braces should be in a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:31:53 +05:30
Madhura Jayaratne
f2bbb10ba6 Add missing parameter comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:30:03 +05:30
Deven Bansod
1ef602ccfd RFE#1359 - Ctrl Navigation in Grid Editor 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-04 12:18:13 +05:30
Weblate
853cc240e7 Merge remote-tracking branch 'origin/master' 2015-06-04 06:25:51 +02:00
Guilherme Souza Silva
27219890ac Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.8% (3041 of 3107 strings)

[CI skip]
 2015-06-04 06:25:49 +02:00
Madhura Jayaratne
93821e27a8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-04 09:55:47 +05:30
Madhura Jayaratne
a5bf1f2e02 ChangeLog entry for rfe 1677 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 09:54:52 +05:30
Hauke Henningsen
7ce7c3c849 Translated using Weblate (German) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-04 01:38:50 +02:00
Domen
ee71586eb6 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3104 of 3104 strings)

[CI skip]
 2015-06-03 20:59:24 +02:00
Madhura Jayaratne
d8b0f061e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-03 17:42:28 +05:30
Madhura Jayaratne
40da17ab72 rfe #1677 Support spatial indexes in table create form 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 17:41:15 +05:30
Marc Delisle
675b589dce Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-03 07:13:07 -04:00
Marc Delisle
9c804d6942 Fix param doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-03 07:08:44 -04:00
Marc Delisle
2f2daec55f Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-03 06:49:41 -04:00
Madhura Jayaratne
4ebc479d2e Fix regression (rfe #1672 MIME types should be lower case) 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 13:26:03 +05:30
Madhura Jayaratne
36f4a22e13 #4941 Table structure multi submit is broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 12:02:31 +05:30
Madhura Jayaratne
15cf89d290 Use camel case 2015-06-03 11:20:26 +05:30
Madhura Jayaratne
babfaf1688 Move common parts of the url out 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 11:15:14 +05:30
Madhura Jayaratne
63db27c42b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-03 11:05:08 +05:30
Madhura Jayaratne
093dda3479 Fix GIS downloads 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 11:03:54 +05:30
Weblate
581edbbe2e Merge remote-tracking branch 'origin/master' 2015-06-03 07:24:20 +02:00
Martin Lacina
72acee3407 Translated using Weblate (Slovak) 
Currently translated at 83.5% (2592 of 3103 strings)

[CI skip]
 2015-06-03 07:24:16 +02:00
Madhura Jayaratne
6bb4ba58b4 #4940 Notices in GIS visualization page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 10:54:09 +05:30
Isaac Bennetch
c3f01101ab Merge pull request #1712 from devenbansod/701AddComments 
Additional improvements to CSS print view
 2015-06-02 09:45:30 -04:00
Deven Bansod
72ad813750 Added some comments in printview.css. Also few minor fixes. 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-02 21:16:31 +05:30
Madhura Jayaratne
245317503d Enum value editor no longer uses popup_background 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 18:37:02 +05:30
Madhura Jayaratne
53b5f39ce6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-02 18:32:49 +05:30
Madhura Jayaratne
532004654c #4939 Connection input field not hidden when adding a new table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 18:31:37 +05:30
Marc Delisle
8c4eab13ea Merge branch 'QA_4_4' 2015-06-02 08:15:22 -04:00
Marc Delisle
347dc70c18 bug #4908 Reverse proxy: infinite internal redirect (added warning in doc) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-02 08:13:41 -04:00
Marc Delisle
cdb1fc1f68 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-06-02 08:03:11 -04:00
Marc Delisle
f033d02497 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-02 08:03:06 -04:00
Madhura Jayaratne
023b9c688c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-02 17:28:50 +05:30