gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,890 Commits 12 Branches 481 Tags 2.4 GiB
2506058df9
Commit Graph

102890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
disorderman
2506058df9 Translated using Weblate (Chinese (China)) 
Currently translated at 82.2% (2647 of 3217 strings)

[CI skip]
 2015-10-06 06:51:35 +02:00
Marc Delisle
be17cf15cb Merge branch 'QA_4_5' 2015-10-05 18:19:34 -04:00
Marc Delisle
ed8ba7b3d7 Fixes #11541 Missing arguments for PMA_Table::generateAlter() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-05 18:18:55 -04:00
Atul Pratap Singh
ad7d40c59e Merge branch 'QA_4_5' 2015-10-06 02:35:26 +05:30
Atul Pratap Singh
2ee40c302b Fix #11540 Undefined property: PMA_Table db_name 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-10-06 02:31:06 +05:30
Weblate
0022851d1c Merge remote-tracking branch 'origin/master' 2015-10-05 22:42:34 +02:00
Giovanni Sora
76e2abfeb9 Translated using Weblate (Interlingua) 
Currently translated at 70.5% (2270 of 3217 strings)

[CI skip]
 2015-10-05 22:42:28 +02:00
Madhura Jayaratne
20974c6ae5 Merge branch 'QA_4_5' 2015-10-06 07:42:11 +11:00
Madhura Jayaratne
f2ef8fb770 ChangeLog for #11539 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 07:40:33 +11:00
Madhura Jayaratne
c2c0a6e179 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-06 07:39:51 +11:00
Madhura Jayaratne
5482849c8c Merge pull request #11537 from madhuracj/issue11522 
Fix #11522 Strange behavior on table rename
 2015-10-06 07:38:46 +11:00
Madhura Jayaratne
38cf9a13f2 Fix #11539 Rename table does not result in refresh in left panel 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 07:23:48 +11:00
Madhura Jayaratne
5a3581e54c Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 07:09:17 +11:00
Madhura Jayaratne
3c8ee7c5f8 Fix #11522 Strange behavior on table rename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-05 20:50:55 +11:00
Michal Čihař
f8e33dcba0 Translated using Weblate (Chinese (China)) 
Currently translated at 79.5% (2559 of 3217 strings)

[CI skip]
 2015-10-05 08:38:45 +02:00
Michal Čihař
3c23c7dd9b Translated using Weblate (Chinese (China)) 
Currently translated at 80.3% (2577 of 3209 strings)

[CI skip]
 2015-10-05 08:38:40 +02:00
Marc Delisle
3eea07d2ad Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 11:11:24 -04:00
Weblate
775cff6d2a Merge remote-tracking branch 'origin/master' 2015-10-04 16:24:06 +02:00
Marc Delisle
d119307237 Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-10-04 16:24:01 +02:00
Marc Delisle
3bdf520bcb Force the documented return type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 10:23:50 -04:00
Marc Delisle
4969d6cd75 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-10-04 16:10:32 +02:00
Weblate
77c5b0a8ad Merge remote-tracking branch 'origin/master' 2015-10-04 14:21:00 +02:00
Luis Ruiz
a47540d2a5 Translated using Weblate (Spanish) 
Currently translated at 99.1% (3190 of 3217 strings)

[CI skip]
 2015-10-04 14:20:55 +02:00
Terry Weng
f001dd67cd Translated using Weblate (Chinese (China)) 
Currently translated at 79.5% (2560 of 3217 strings)

[CI skip]
 2015-10-04 14:20:50 +02:00
Marc Delisle
80ccd03bab Merge branch 'QA_4_5' 2015-10-04 08:20:41 -04:00
Weblate
7f5f77b4a1 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-04 14:20:34 +02:00
Luis Ruiz
1d4894bcfd Translated using Weblate (Spanish) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-10-04 14:20:32 +02:00
Terry Weng
72be2da94a Translated using Weblate (Chinese (China)) 
Currently translated at 80.3% (2578 of 3209 strings)

[CI skip]
 2015-10-04 14:20:29 +02:00
Marc Delisle
8fe17dda90 Clarify possible values 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 08:20:16 -04:00
Marc Delisle
0e7e952b7b Remove author name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:15:49 -04:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Madhura Jayaratne
5eef3a9b60 Merge branch 'QA_4_5' 2015-10-03 22:50:59 +10:00
Madhura Jayaratne
4633d2458f ChangeLog entry for issue #11519 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-03 22:48:10 +10:00
Madhura Jayaratne
88527a0ff0 Merge pull request #11534 from udan11/fix_11519 
Fix #11519. Bug while exporting results when a joined table field name is in SELECT query.
 2015-10-03 22:44:07 +10:00
Madhura Jayaratne
5d2fa0d91b Merge branch 'QA_4_5' 2015-10-03 22:20:06 +10:00
Madhura Jayaratne
b41ab56e3b Fix #11526 Foreign key to other database's tables fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-03 22:14:49 +10:00
Madhura Jayaratne
0da6a5b54b Merge pull request #11533 from udan11/fix_11526 
Support for references from other tables.
 2015-10-03 22:13:18 +10:00
Dan Ungureanu
a707ab5616 Fixes #11519. Bug while exporting results when a joined table field name is in SELECT query. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-03 12:33:41 +03:00
Dan Ungureanu
f0354276d9 Support for references from other tables. 
Cherry-picked udan11/sql-parser@d1e565d2bb.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-03 12:33:23 +03:00
Marc Delisle
b77c874db6 Merge branch 'QA_4_5' 2015-10-02 13:26:28 -04:00
Weblate
aebc242b58 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-02 19:26:26 +02:00
Burak Yavuz
82484ad5b7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-10-02 19:26:23 +02:00
Luis
8fa17ecf9c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.7% (2976 of 3209 strings)

[CI skip]
 2015-10-02 19:26:20 +02:00
Andrey Aleksanyants
ab460984b0 Translated using Weblate (Armenian) 
Currently translated at 67.2% (2158 of 3209 strings)

[CI skip]
 2015-10-02 19:26:17 +02:00
Marc Delisle
33f1fe5bd9 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-02 13:26:03 -04:00
Dan Ungureanu
238e00b5d9 Fix #11531. Invalid SQL in table definition when exporting table. 
Cherry-picked udan11/sql-parser@e5b1cd830d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-02 13:24:35 -04:00
Weblate
ec7cc62e71 Merge remote-tracking branch 'origin/master' 2015-10-02 19:22:59 +02:00
Luis
a8cd36cd9c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.9% (2957 of 3217 strings)

[CI skip]
 2015-10-02 19:22:54 +02:00
Stefano Martinelli
8ca9d0d751 Translated using Weblate (Italian) 
Currently translated at 99.9% (3216 of 3217 strings)

[CI skip]
 2015-10-02 19:22:49 +02:00
Παναγιώτης Παπάζογλου
29c53b232d Translated using Weblate (Greek) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-10-02 19:22:44 +02:00