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

101960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dingo thirteen
d073bf4ca7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-23 12:37:35 +02:00
Marc Delisle
c6c6e5fa41 Translated using Weblate (French) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-23 12:27:04 +02:00
Domen
d00e9b998d Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-22 17:01:17 +02:00
Stefano Martinelli
9a3caeb8a8 Translated using Weblate (Italian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-22 16:49:03 +02:00
Marc Delisle
cc42bd2b99 Make Travis happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 10:31:00 -04:00
Burak Yavuz
70b5c9ddeb Translated using Weblate (Turkish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-22 16:12:46 +02:00
Marc Delisle
66f8e7d1db Merge pull request #11420 from udan11/update 
Updated sql-parser library.
 2015-08-22 07:55:08 -04:00
Marc Delisle
4d33796041 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:48:31 -04:00
Marc Delisle
325c318e00 Clarify explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:47:49 -04:00
Marc Delisle
c3702e8d93 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:41:11 -04:00
Marc Delisle
569e0c1414 Merge pull request #11419 from nisargjhaveri/combine_indexes 
Create indexes with table creation if "IF NOT EXISTS" is on
 2015-08-22 07:37:45 -04:00
Nisarg Jhaveri
b2e8e4660b Create indexes with table creation if "IF NOT EXISTS" is on 
- change default of IF NOT EXISTS option in export
- Add warning for efficiency with IF NOT EXISTS option

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-22 02:18:38 +05:30
Dan Ungureanu
4988084fff Fixed minor formatting issues. 
Updated sql-parser library to udan11/sql-parser@1b2988f296.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-21 15:55:26 +03:00
Marc Delisle
6a9d80eb89 Minimum supported PHP version is now 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-21 07:55:16 -04:00
Jason
fb2fb18dcd Fixes issue #11399. 
- Also some changes were made to prevent same kind of bug from occuring again

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-21 07:23:27 -04:00
Madhura Jayaratne
88132a7fc6 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-21 06:49:47 +05:30
Madhura Jayaratne
aed8527845 Make the SQL exports compatible for side by side comparison with old exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 23:45:46 +05:30
Marc Delisle
932471e46b Fixes #11416 Can't use method return value in write context 
(Tested in PHP 5.4.44)

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 12:04:01 -04:00
Marc Delisle
3f307d21cb Some GSoC 2015 credits 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 09:42:01 -04:00
Marc Delisle
8a20928516 4.4.14 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 08:51:15 -04:00
Marc Delisle
df2a09773b Merge branch 'QA_4_4' 2015-08-20 08:50:27 -04:00
Marc Delisle
8085010441 4.4.15-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 08:45:53 -04:00
Madhura Jayaratne
5f4e8e0f2b Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:53:01 +05:30
Madhura Jayaratne
259564b979 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:46:35 +05:30
Madhura Jayaratne
e27ae93962 Organize export options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:46:24 +05:30
Madhura Jayaratne
3307089efa Be more explicit that this directive is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:38:25 +05:30
Madhura Jayaratne
f5a02f0eca sql_auto_increment is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:30:44 +05:30
Madhura Jayaratne
da1d274078 Fix - Respect the Auto increment checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:24:29 +05:30
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Madhura Jayaratne
5a94689562 Spatial indexes with multiple columns are not allowed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 07:15:03 +05:30
Madhura Jayaratne
f6e64a1ddc Merge branch 'QA_4_4' 
Conflicts:
	libraries/structure.lib.php
 2015-08-20 07:11:30 +05:30
Madhura Jayaratne
6633ec52f7 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-08-20 06:52:16 +05:30
Madhura Jayaratne
a6c1ef840b ChangeLog entry for #11410 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 06:51:07 +05:30
Weblate
da15df391b Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-20 03:18:46 +02:00
Andrey Aleksanyants
19adf712d8 Translated using Weblate (Armenian) 
Currently translated at 62.3% (1894 of 3040 strings)

[CI skip]
 2015-08-20 03:18:42 +02:00
Madhura Jayaratne
54246761ef Fix #11410 SPATIAL index option is not clickable. Spatial indexes are supported by InnoDB from MySQL 5.7.5 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 06:48:21 +05:30
Weblate
1d41837387 Merge remote-tracking branch 'origin/master' 2015-08-19 17:43:24 +02:00
Andrey Aleksanyants
0a437b5c2d Translated using Weblate (Armenian) 
Currently translated at 62.7% (2010 of 3205 strings)

[CI skip]
 2015-08-19 17:43:20 +02:00
Marc Delisle
24163fa0e7 * Add a quick way to verify the GPG fingerprint 
* Add keybase.io info about the releasing manager

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 11:41:22 -04:00
Weblate
c825ef39ed Merge remote-tracking branch 'origin/master' 2015-08-19 14:54:16 +02:00
Weblate
33fff49422 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-19 14:54:13 +02:00
Andrey Aleksanyants
e93722b553 Translated using Weblate (Armenian) 
Currently translated at 60.6% (1944 of 3205 strings)

[CI skip]
 2015-08-19 14:54:12 +02:00
Andrey Aleksanyants
e47bd0f14b Translated using Weblate (Armenian) 
Currently translated at 60.1% (1830 of 3040 strings)

[CI skip]
 2015-08-19 14:54:09 +02:00
Michal Čihař
003a828d38 Merge branch 'QA_4_4' 2015-08-19 14:54:01 +02:00
Michal Čihař
cbb6fe04a0 Merge commit '6541323cac72e209b3b4195e5f292b09fccebc60' 2015-08-19 14:53:53 +02:00
Michal Čihař
24df856fd9 PHP 5.3 should now work as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-19 14:53:42 +02:00
Weblate
1d97280182 Merge remote-tracking branch 'origin/master' 2015-08-19 14:33:08 +02:00
Andrey Aleksanyants
1f652a59fd Translated using Weblate (Armenian) 
Currently translated at 60.3% (1935 of 3205 strings)

[CI skip]
 2015-08-19 14:33:04 +02:00
Marc Delisle
da05ed6316 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 08:32:45 -04:00
Weblate
6541323cac Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-19 14:30:13 +02:00