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

101708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Madhura Jayaratne
52516b07e6 No longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 16:36:31 +05:30
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
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
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
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
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
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
Marc Delisle
7c0fb416b5 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 13:53:26 -04:00
Marc Delisle
f274aecc96 Merge branch 'QA_4_4' 2015-08-08 13:52:56 -04:00
Marc Delisle
1894a22dbf Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 13:52:09 -04:00
Marc Delisle
b2176f477e Merge branch 'QA_4_4' 2015-08-08 13:50:25 -04:00
Marc Delisle
94a3c367f2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 13:49:49 -04:00
Marc Delisle
b85267c151 Merge pull request #11369 from devenbansod/issue_11367 
Fix Issue #11367
 2015-08-08 13:47:56 -04:00
Deven Bansod
72afd81c43 Do not act, if no row is selected from query output 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-08-08 23:54:16 +05:30
Marc Delisle
23aecf5123 Merge branch 'QA_4_4' 2015-08-08 12:17:08 -04:00
Marc Delisle
cbb921a2ec 4.4.13.1 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 12:15:59 -04:00
Marc Delisle
fafa03f9af Revert "Handle comments in the beginning of the query" 
This reverts commit 55a2d06cca.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 12:15:16 -04:00
Marc Delisle
df01d6a3bb Use github references in ChangeLog for 4.5.0 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-08 07:13:15 -04:00
Madhura Jayaratne
56b38eaa6f Pre-load rename and copy operations with current database name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-07 21:10:01 +05:30
Madhura Jayaratne
6cb838cef8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-07 20:59:18 +05:30