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

101721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
b29dc104bf Merge remote-tracking branch 'origin/master' 2015-08-10 14:42:41 +02:00
dingo thirteen
f7d0f9ac34 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-10 14:42:37 +02:00
Marc Delisle
a6fedd3415 Merge branch 'QA_4_4' 2015-08-10 08:42:23 -04:00
Marc Delisle
9fb5d8393d Merge commit '5924811' 2015-08-10 08:42:16 -04:00
Marc Delisle
c0803823f2 Fixes #11380 Incomplete message after import 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 08:41:07 -04:00
dingo thirteen
5924811985 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 14:38:35 +02:00
Madhura Jayaratne
52516b07e6 No longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 16:36:31 +05:30
Stefano Martinelli
4b35964699 Translated using Weblate (Italian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 13:03:54 +02:00
Giovanni Sora
630bf5db8a Translated using Weblate (Interlingua) 
Currently translated at 69.6% (2116 of 3040 strings)

[CI skip]
 2015-08-10 13:03:53 +02:00
Marc Delisle
6e7c0a1cb4 Translated using Weblate (French) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 13:03:37 +02:00
Madhura Jayaratne
ba4eb9e538 Merge pull request #11379 from madhuracj/structureController 
Create separate controllers from table and database structure pages
 2015-08-10 16:21:49 +05:30
Madhura Jayaratne
edf833644b Merge branch 'master' into structureController 
Conflicts:
	libraries/controllers/StructureController.class.php
 2015-08-10 16:19:13 +05:30
Madhura Jayaratne
2109cd3c35 Merge pull request #11378 from madhuracj/templates 
Organize templates into a meaningful structure
 2015-08-10 16:07:03 +05:30
Παναγιώτης Παπάζογλου
625f4e4f9f Translated using Weblate (Greek) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-10 12:21:27 +02:00
Madhura Jayaratne
c90d05f3b2 Use instance variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 15:50:32 +05:30
Παναγιώτης Παπάζογλου
fff8ccd5b9 Translated using Weblate (Greek) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 12:06:11 +02:00
Madhura Jayaratne
95361255c5 No need to pass as method variables when the values can be accessed with instance variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 15:35:38 +05:30
Madhura Jayaratne
a9796dd0c7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-10 15:18:29 +05:30
Madhura Jayaratne
97f005b5ce Fix bug - Counting real number of rows always return zero 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 15:12:32 +05:30
Madhura Jayaratne
a599b61534 Create separate controllers from table and database structure pages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 15:09:17 +05:30
Kristjan Räts
aa08267262 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-10 11:06:26 +02:00
Kristjan Räts
47d297dc66 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 11:04:25 +02:00
Madhura Jayaratne
8854ce7f29 Move logo template to navigation folder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 12:06:45 +05:30
Madhura Jayaratne
b78dba8d39 Group index template with templates related to table level operations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 12:03:52 +05:30
Madhura Jayaratne
8e3a747bd7 Split structure related templates to database and table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 12:00:58 +05:30
Madhura Jayaratne
5cf4f990ff Revert "Move column definitions related templates inside table folder" Column definitions are used in central column and normalization as well 
This reverts commit 5ca01bfffc.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 11:07:16 +05:30
Madhura Jayaratne
4ab5481084 create_table.phtml is more suited with database related templates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 11:02:31 +05:30
Madhura Jayaratne
97083bfd67 Secondary tabs is generic enough to be moved out of table related template folder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 11:01:53 +05:30
Madhura Jayaratne
1391c3a097 Move designer related templates into database folder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 10:56:39 +05:30
Madhura Jayaratne
5ca01bfffc Move column definitions related templates inside table folder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 10:53:24 +05:30
Madhura Jayaratne
62280cbca1 Organize chart and gis visualization related templates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 10:48:54 +05:30
Madhura Jayaratne
d149062394 Organize templates related to table relations view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 10:44:03 +05:30
Madhura Jayaratne
e807787610 Organize table search related templates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 10:39:14 +05:30
Hauke Henningsen
a3af754db0 Translated using Weblate (German) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 00:17:25 +02:00
Hugues Peccatte
4e2310d546 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 16:14:40 +02:00
Hugues Peccatte
d368950fcc Fix unexisting local variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 16:13:51 +02:00
Hugues Peccatte
b230e33064 Reduce nested level. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 16:10:10 +02:00
Hugues Peccatte
a885e45667 Update PHPDoc. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 16:05:24 +02:00
Atul Pratap Singh
2afeea9b81 Merge pull request #11373 from Tithugues/setDefaultsToTemplate_master 
Set default values to variables on some templates.
 2015-08-09 17:41:24 +05:30
Hugues Peccatte
4b6cab69cc Set default values to variables on some templates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-09 13:14:45 +02:00
Marc Delisle
2a14d62115 Merge pull request #11371 from udan11/update 
Update sql-parser.
 2015-08-09 05:50:28 -04:00
Burak Yavuz
cd80cb61a0 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-09 11:31:00 +02:00
Domen
21453415d7 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-09 11:30:59 +02:00
Giovanni Sora
88010e5d99 Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2256 of 3201 strings)

[CI skip]
 2015-08-09 11:30:58 +02:00
Marc Delisle
d4851d5898 Translated using Weblate (French) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-09 11:30:49 +02:00
Domen
cfd828c5cd Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-09 02:11:02 +02:00
Stefano Martinelli
4e6ec806d4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-08 22:19:12 +02:00
Burak Yavuz
7d853ce0ed Translated using Weblate (Turkish) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-08 21:22:35 +02:00
Dan Ungureanu
a4119316c6 Updated sql-parser to udan11/sql-parser@77d5409b57. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-08 21:35:49 +03:00
Dan Ungureanu
54e80e953d Updated sql-parser to udan11/sql-parser@84bc88b6f6. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-08 21:35:06 +03:00