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

113188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
80914e327e Adding composer lock for 4.7.9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:37:10 -05:00
Isaac Bennetch
b3b170da62 Prepare for version 4.7.9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:35:48 -05:00
Isaac Bennetch
c9513bb7bb Improvements to the phrasing of the documentation. 
Mostly taken from suggestions by anjalisasi in
https://github.com/phpmyadmin/phpmyadmin/pull/13901
https://github.com/phpmyadmin/phpmyadmin/pull/13902
https://github.com/phpmyadmin/phpmyadmin/pull/13903

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-05 10:15:44 -05:00
Michal Čihař
b315e1cac5 Move changelog entry for #13940 2018-03-05 15:48:12 +01:00
Michal Čihař
92b8c16c25 Merge branch 'QA_4_7' 2018-03-05 15:47:36 +01:00
Michal Čihař
3034a23fed Revert "Honor arg_separator in AJAX requests" 
This reverts commit 984c6a0054.

See #13940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-05 15:46:32 +01:00
Michal Čihař
16c6c114fa Revert "Fix missing addition operator on string concatenation" 
This reverts commit a0024aa041.
 2018-03-05 15:45:54 +01:00
Yaron Shahrabani
539bea6db8 Translated using Weblate (Hebrew) 
Currently translated at 15.9% (524 of 3288 strings)

[CI skip]
 2018-03-05 14:36:58 +01:00
Yaron Shahrabani
93da5b0af8 Translated using Weblate (Hebrew) 
Currently translated at 16.5% (532 of 3208 strings)

[CI skip]
 2018-03-05 14:36:51 +01:00
Maurício Meneghini Fauth
821d33704c
Merge pull request #14040 from mauriciofauth/issue-13918 
Add Yarn install to create-release script
 2018-03-03 15:27:36 -03:00
Saksham Gupta
0eaf1b108c Add cookie restore and empty save error 
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
 2018-03-02 11:50:13 +05:30
Isaac Bennetch
466e11f882 Merge remote-tracking branch 'origin/master' 2018-03-01 23:33:42 -05:00
Isaac Bennetch
b07b28b74c Merge branch 'QA_4_7' 2018-03-01 23:32:26 -05:00
Isaac Bennetch
e5edef4639 English-language fixup. 
Thanks to "rafpaf" for noticing this at https://github.com/phpmyadmin/phpmyadmin/pull/13997

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-01 23:32:16 -05:00
Isaac Bennetch
5794060f83 Add GSoC 2017 to credits 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-01 22:35:47 -05:00
Maurício Meneghini Fauth
4c04093a35 Fix warning when session is active 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-01 23:17:16 -03:00
Maurício Meneghini Fauth
c65e9c330e Remove @ operator from ini_set() 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-01 22:36:35 -03:00
Maurício Meneghini Fauth
38767030ef Remove @ operator from ini_get() 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-01 22:36:35 -03:00
Maurício Meneghini Fauth
cf60373e84 Remove @ operator from extension_loaded() 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-01 22:36:35 -03:00
Maurício Meneghini Fauth
35eb2da38a Remove @ operator from function_exists 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-01 22:36:35 -03:00
Maurício Meneghini Fauth
1a322e1a8f Merge branch 'QA_4_7' 2018-03-01 22:27:44 -03:00
Maurício Meneghini Fauth
a0024aa041 Fix missing addition operator on string concatenation 
Fix #14050

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-01 22:15:04 -03:00
Isaac Bennetch
3d4b9eaeab Merge branch 'QA_4_7' 2018-03-01 10:56:09 -05:00
Isaac Bennetch
1270873d51 More ChangeLog entries related to c21a9cf; issues #13927 and #13887 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-01 10:55:01 -05:00
Michal Čihař
f4026f60a4 Merge branch 'QA_4_7' 2018-03-01 16:02:57 +01:00
Michal Čihař
92ef798a53 Merge remote-tracking branch 'origin/QA_4_7' 2018-03-01 15:50:49 +01:00
Michal Čihař
c9153ed21a Changelog for #14036 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-01 15:50:41 +01:00
Michal Čihař
984c6a0054 Honor arg_separator in AJAX requests 
Fixes #13940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-01 15:50:41 +01:00
Michal Čihař
befd2de85a
Merge pull request #14048 from nulll-pointer/query_builder 
Fixes adding new column in query builder,  #14047
 2018-03-01 15:08:28 +01:00
Lakshay arora
915c94567c Fixes #14047 
Signed-off-by: Lakshay arora(arora.lakshay123@gmail.com)
 2018-03-01 14:11:05 +05:30
Weblate
68d42ce0b8 Merge remote-tracking branch 'origin/master' 2018-03-01 08:51:02 +01:00
Weblate
bfbea294f3 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-03-01 08:50:58 +01:00
Yaron Shahrabani
3481e3c270 Translated using Weblate (Hebrew) 
Currently translated at 16.3% (523 of 3208 strings)

[CI skip]
 2018-03-01 08:50:52 +01:00
Yaron Shahrabani
86f884095a Translated using Weblate (Hebrew) 
Currently translated at 15.6% (515 of 3288 strings)

[CI skip]
 2018-03-01 08:50:51 +01:00
Michal Čihař
1a2f354904 Merge branch 'QA_4_7' 2018-03-01 08:49:55 +01:00
Michal Čihař
2d352492b1 More up to date OpenDocument docs 
Currently all vendors support this.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-01 08:49:47 +01:00
Michal Čihař
344c0ac849 Merge remote-tracking branch 'origin/pull/14035' 2018-03-01 07:56:35 +01:00
Saksham Gupta
8537d0125a Fix whitespaces 
Signed-off-by: Saksham Gupta <shucon01@gmail.com>
 2018-03-01 02:20:53 +05:30
Saksham Gupta
e5ff7f34fe Restore SQL query after session expire 
Partially Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/13654

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
 2018-03-01 02:17:28 +05:30
Isaac Bennetch
733a3f1c0b Merge remote-tracking branch 'origin/master' 2018-02-27 23:14:10 -05:00
Isaac Bennetch
6e22171fa6 Revert version to 4.8.0-dev for ongoing development and error reporting server details 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-27 23:04:54 -05:00
Isaac Bennetch
7d1883077b Minor typos in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-27 23:04:53 -05:00
Isaac Bennetch
9787c9c762 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-27 23:04:53 -05:00
Isaac Bennetch
31e9a31695 Adding composer lock for 4.8.0-alpha1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-27 23:04:53 -05:00
Isaac Bennetch
032f13bbac Update version number for 4.8.0-alpha1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-27 23:04:53 -05:00
Isaac Bennetch
0664827c3c Fix typo in create-release.sh help 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-02-27 23:04:53 -05:00
Michal Čihař
089dce9af3 Merge branch 'QA_4_7' 2018-02-27 22:35:51 +01:00
Michal Čihař
aac6405016 Translated using Weblate (Polish) 
Currently translated at 94.3% (3102 of 3288 strings)

[CI skip]
 2018-02-27 22:31:59 +01:00
Michal Čihař
62fc8e24f4 Translated using Weblate (Polish) 
Currently translated at 98.6% (3166 of 3208 strings)

[CI skip]
 2018-02-27 22:31:30 +01:00
Maurício Meneghini Fauth
056edba397 Merge branch 'QA_4_7' 2018-02-27 18:14:01 -03:00