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

100647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
bde0393fcd Merge remote-tracking branch 'origin/master' 2015-06-27 11:20:06 +02:00
Franco
126face92b Translated using Weblate (Spanish) 
Currently translated at 99.4% (3108 of 3125 strings)

[CI skip]
 2015-06-27 11:20:01 +02:00
Renato Rodrigues de Lima Júnio
3b954d6fdc Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.2% (3036 of 3123 strings)

[CI skip]
 2015-06-27 11:19:58 +02:00
Marc Delisle
1f2891e05f Instructions for new incremental release notes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-27 05:19:49 -04:00
Stefano Martinelli
de0f48d443 Translated using Weblate (Italian) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-27 10:58:15 +02:00
Marco Pozzato
1ef3f0c7e2 Translated using Weblate (Italian) 
Currently translated at 99.9% (3122 of 3125 strings)

[CI skip]
 2015-06-27 10:57:11 +02:00
Kristjan Räts
0c9a6fd4e0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-26 19:46:55 +02:00
Marc Delisle
659e0c3722 - Move count() outside of loop 
- Clarify variable name

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-26 07:37:03 -04:00
Madhura Jayaratne
8403329670 Preserver preference auto loading notice 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-26 14:20:45 +05:30
Madhura Jayaratne
f8120cc084 Add left margin for preference auto loading notice 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-26 14:18:27 +05:30
Madhura Jayaratne
cb90efe029 Merge branch 'QA_4_4' 2015-06-26 14:14:34 +05:30
Madhura Jayaratne
9aa15746bc Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-26 14:11:37 +05:30
Madhura Jayaratne
2aea2b8902 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-26 14:10:25 +05:30
Weblate
c82ea05c99 Merge remote-tracking branch 'origin/master' 2015-06-26 10:38:43 +02:00
Renato Rodrigues de Lima Júnio
37b82c246d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.0% (3032 of 3123 strings)

[CI skip]
 2015-06-26 10:38:40 +02:00
Madhura Jayaratne
894ff19c49 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-26 14:07:50 +05:30
Madhura Jayaratne
d9afc6a7ec Merge branch 'QA_4_4' 2015-06-26 14:07:00 +05:30
Weblate
a3edd0b7dd Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-26 10:34:56 +02:00
Renato Rodrigues de Lima Júnio
b47b1dc2e6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.8% (3029 of 3035 strings)

[CI skip]
 2015-06-26 10:34:53 +02:00
Madhura Jayaratne
beaa73274f Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-26 14:04:38 +05:30
Madhura Jayaratne
e453cb818b bug #4969 Autoload from prefs_storage not behaving properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-26 14:03:18 +05:30
Marc Delisle
e721080899 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-25 08:33:33 -04:00
Madhura Jayaratne
ad01805ecc ChangeLog entry for rfe #1561 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 17:55:21 +05:30
Madhura Jayaratne
920ff9a47e Merge pull request #1762 from madhuracj/rfe1561 
RFE #1561 Being able to use multiple servers at the same time when using cookie auth
 2015-06-25 17:49:40 +05:30
Madhura Jayaratne
01354d9d95 #1561 Being able to use multiple servers at the same time when using cookie auth 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 17:33:18 +05:30
Domen
e146b4dfc8 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-25 11:36:01 +02:00
Madhura Jayaratne
679015ea52 rfe #1552 CSV import: Allow "Columns escaped with" to be optional 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 12:58:48 +05:30
Madhura Jayaratne
6f4e0b2a77 rfe #1531 Cant use external config file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 12:18:17 +05:30
Madhura Jayaratne
8a567b7b66 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-25 11:44:30 +05:30
Madhura Jayaratne
15a3686fd3 Better text for the submit button 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 11:42:50 +05:30
Marc Delisle
3da1dbac99 Merge pull request #1760 from udan11/fix_syntax 
Syntax error and refactoring.
 2015-06-24 17:37:53 -04:00
Stefano Martinelli
777bca0983 Translated using Weblate (Italian) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-24 22:37:39 +02:00
Dan Ungureanu
3b56d90297 Syntax error and refactoring. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-06-24 19:45:49 +03:00
Isaac Bennetch
0211920790 Merge pull request #1759 from devenbansod/1060C 
Changed the mysql reserved words conflicting column names in Designer settings
 2015-06-24 10:02:20 -04:00
Deven Bansod
3d1157c944 Changed the mysql reserved words conflicting column names 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-25 00:14:06 +05:30
Madhura Jayaratne
dd7230cc20 Fix tests for PMA_getDefaultPage and new tests for PMA_getLoadingPage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 18:13:33 +05:30
Madhura Jayaratne
ee7564af01 Load in visual query builder the default pdf page if such exists 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 18:01:55 +05:30
Madhura Jayaratne
57a84214da Add missing backquotes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 17:29:19 +05:30
Madhura Jayaratne
d4af9bc634 Fix syntax error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 17:13:03 +05:30
Madhura Jayaratne
7450a2093f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-24 17:05:25 +05:30
Madhura Jayaratne
77a0b44fc3 Merge branch 'QA_4_4' 
Conflicts:
	libraries/db_designer.lib.php
 2015-06-24 17:04:12 +05:30
Weblate
e2f0d39d61 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-24 13:30:46 +02:00
Burak Yavuz
c51e4fa388 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-24 13:30:43 +02:00
Franco
cb2c250478 Translated using Weblate (Spanish) 
Currently translated at 99.9% (3033 of 3035 strings)

[CI skip]
 2015-06-24 13:30:39 +02:00
Sebastian
9edee922d4 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 63.8% (1938 of 3035 strings)

[CI skip]
 2015-06-24 13:30:35 +02:00
Zrng Abdulla
b563d90593 Translated using Weblate (Kurdish Sorani) 
Currently translated at 20.5% (624 of 3035 strings)

[CI skip]
 2015-06-24 13:30:32 +02:00
Madhura Jayaratne
a0beb6da88 bug Missing selected/entered values when editing active options in visual query builder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 17:00:01 +05:30
Marc Delisle
5784566a23 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-24 07:15:37 -04:00
Madhura Jayaratne
be31498242 Bug - show build query dialog in full screen view also 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 16:00:59 +05:30
Madhura Jayaratne
6f1e69afc5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-24 13:42:30 +05:30