gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,548 Commits 12 Branches 481 Tags 2.4 GiB
916e05dca5
Commit Graph

107548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
855899628a Specify we are using MySQL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:34 +02:00
Michal Čihař
fffbcd1969 Avoid using non breakable space in code samples 
- It's not possible to copy and paste it then
- It's not possible to use syntax highlighting on these

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
21beba716a Fix missing references in docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
4fc27b8e8e Compatibility with Sphinx 1.4 
See https://github.com/sphinx-doc/sphinx/issues/2673

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
b10e57099d Add documentation checks to be executed in Travis CI 
- Validate all internal references
- Validate parse errors
- Validate external links

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:26:33 +02:00
Michal Čihař
ece3dd04fb Remove deprecated --dev from composer calls 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:17:54 +02:00
Michal Čihař
7642280aa1 Disable runkit install for PHP 7.1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 10:16:43 +02:00
Deven Bansod
3a785fb07f Fix typos in faq 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-18 13:16:16 +05:30
Michal Čihař
978538dce8 Use http_response_code to set response code 
Fixes #12646

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 09:17:55 +02:00
Michal Čihař
d4c3d283ca Document Wordfence problems 
Fixes #12628

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 09:10:27 +02:00
Deven Bansod
1d70d34a46 Merge branch 'QA_4_6' 2016-10-18 11:24:22 +05:30
Deven Bansod
c7aa10e266 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-18 11:23:09 +05:30
Deven Bansod
9880f57344 Fix incorrect clause generation in getting ForeignData if LIMIT provided 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-18 11:10:47 +05:30
Michal Čihař
1aee86a4fe Remove the nopasswd setting 
It does nothing since removal of related feature in
53f541af86.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:20:54 +02:00
Michal Čihař
0e03ffdb76 Merge branch 'QA_4_6' 2016-10-17 17:13:31 +02:00
Michal Čihař
307dd63354 ChangeLog entry for #12472 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:13:25 +02:00
Michal Čihař
6a4cf7b1ec Merge pull request #12631 from devenbansod/fix_12472 
Fix order of testing DBConnection with different parameters in Config method
 2016-10-17 17:12:40 +02:00
Michal Čihař
4311ea09d9 Merge branch 'QA_4_6' 2016-10-17 17:03:12 +02:00
Michal Čihař
d47956461f Merge remote-tracking branch 'origin/pull/12616' into QA_4_6 2016-10-17 17:02:25 +02:00
Michal Čihař
62b6e640fc Merge branch 'QA_4_6' 2016-10-17 17:01:18 +02:00
Michal Čihař
153d6ca4f0 Merge remote-tracking branch 'origin/QA_4_6' 2016-10-17 17:01:15 +02:00
Michal Čihař
198e257da4 Merge commit '57451f31c8ef8ba0d9dd695dd9004dbdaec2e10c' 2016-10-17 17:01:06 +02:00
Michal Čihař
d6680545ff ChangeLog entry for #12632 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:00:42 +02:00
Weblate
0b59c6283e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 16:59:52 +02:00
SDSkyKlouD
eebe1471b7 Translated using Weblate (Korean) 
Currently translated at 79.7% (2558 of 3206 strings)

[CI skip]
 2016-10-17 16:59:51 +02:00
Michal Čihař
57451f31c8 Merge pull request #12632 from devenbansod/fix_12366 
Use IDENTIFIED BY 'auth_string' if password check plugin is active
 2016-10-17 16:59:43 +02:00
Weblate
4f11e13e17 Merge remote-tracking branch 'origin/master' 2016-10-17 16:53:38 +02:00
SDSkyKlouD
97c182c715 Translated using Weblate (Korean) 
Currently translated at 79.4% (2557 of 3219 strings)

[CI skip]
 2016-10-17 16:53:36 +02:00
Michal Čihař
4e237821fc Use 7.1.0RC3 for tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 16:52:11 +02:00
Deven Bansod
25ee53c183 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-17 13:40:25 +05:30
Weblate
870527df77 Merge remote-tracking branch 'origin/master' 2016-10-17 10:10:00 +02:00
Deven Bansod
555d5104b5 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/ko.po
 2016-10-17 13:41:21 +05:30
Zulfikar
d28c77783d Translated using Weblate (Indonesian) 
Currently translated at 69.2% (2228 of 3219 strings)

[CI skip]
 2016-10-17 10:09:57 +02:00
Deven Bansod
f9ed7a5054 ChangeLog for #12639 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-17 13:39:11 +05:30
Deven Bansod
334910216e Check if the function actually has arguments or not 
Fix #12639

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-17 13:36:09 +05:30
Weblate
d37af63415 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 10:05:19 +02:00
Zulfikar
61ec405c16 Translated using Weblate (Indonesian) 
Currently translated at 69.6% (2232 of 3206 strings)

[CI skip]
 2016-10-17 10:05:18 +02:00
Deven Bansod
1824f33650 Use justBrowsing only if outputting the results from a single table 
The issue #12533 happens because we use countRecords on the parent table since it is incorrectly set,
while actually we should be looking at SQL_CALC_FOUND_ROWS instead.

Fix #12533

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 13:32:52 +05:30
Weblate
04408b1f52 Merge remote-tracking branch 'origin/master' 2016-10-15 09:38:23 +02:00
Deven Bansod
790882735d Merge branch 'QA_4_6' 2016-10-15 13:09:59 +05:30
Deven Bansod
1aaedb32ca Don't output edit/delete row links when table is not set 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 13:08:58 +05:30
SDSkyKlouD
dbdd146794 Translated using Weblate (Korean) 
Currently translated at 78.5% (2529 of 3219 strings)

[CI skip]
 2016-10-15 09:38:21 +02:00
Weblate
55b3366d64 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-15 09:37:45 +02:00
SDSkyKlouD
96b40611db Translated using Weblate (Korean) 
Currently translated at 78.9% (2530 of 3206 strings)

[CI skip]
 2016-10-15 09:37:43 +02:00
Deven Bansod
89d10569e9 Merge branch 'QA_4_6' 
Conflicts:
	po/ko.po
	po/pt_BR.po
 2016-10-15 11:57:51 +05:30
Deven Bansod
5c600140cc Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-15 11:56:19 +05:30
Deven Bansod
adec50866c ChangeLog for #12338 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 11:55:38 +05:30
Deven Bansod
02b1d17c56 Reload the current page after adding/deleting a relation in Designer 
Fix #12338

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 10:49:39 +05:30
Weblate
90d81d9ffd Merge remote-tracking branch 'origin/master' 2016-10-15 07:19:03 +02:00
Deven Bansod
57d4ad7c43 Merge branch 'QA_4_6' 2016-10-15 10:50:46 +05:30