gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,857 Commits 12 Branches 481 Tags 2.4 GiB
6640fe2877
Commit Graph

103857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
6640fe2877 Merge branch 'QA_4_5' 2015-11-26 19:43:32 +05:30
Deven Bansod
83672ac65c Changelog entry for #11691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:43:21 +05:30
Deven Bansod
bc0eda0936 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-11-26 19:33:22 +05:30
Deven Bansod
77f220cee5 Merge branch 'QA_4_5' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/plugins/auth/AuthenticationCookie.php
 2015-11-26 19:29:18 +05:30
Deven Bansod
8eb712579d Fixes #11693 : Flush privileges overusage - related to issue 11597 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:25:18 +05:30
Deven Bansod
31001963d2 Changelog entry for #11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 19:20:04 +05:30
Deven Bansod
e8b8d670cd Fix an error in merge 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 14:45:34 +05:30
Deven Bansod
107f054ed6 Merge branch 'QA_4_5' 
Conflicts:
	libraries/server_privileges.lib.php
	po/pt_BR.po
	user_password.php
 2015-11-26 14:40:25 +05:30
Deven Bansod
68555d3584 Merge pull request #11692 from devenbansod/fix_11691 
Fixes #11691 : Query was empty on creating User in 4.5.2
 2015-11-26 14:10:51 +05:30
Deven Bansod
0a4fd5d87b Fixes issue 11691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-26 15:13:29 +05:30
Madhura Jayaratne
9416ff7c3f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-26 19:28:41 +11:00
Madhura Jayaratne
cd6e5b0025 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-26 19:26:26 +11:00
Deven Bansod
fa36f00198 Merge pull request #11686 from devenbansod/fix_11684 
Fix issue #11684
 2015-11-26 08:56:05 +05:30
Marc Delisle
0d8a4425d4 Merge branch 'QA_4_5' 2015-11-25 09:43:46 -05:00
Weblate
060884139c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-25 15:43:24 +01:00
Jader Teixeira
67b9ab471a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.6% (2974 of 3211 strings)

[CI skip]
 2015-11-25 15:43:23 +01:00
Marc Delisle
2217a47934 With this fix, the generated SQL still gives on-screen warnings on semicolons 
but this will require a fix in the parser.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-25 09:41:58 -05:00
Marc Delisle
9334a2d356 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-24 10:18:58 -05:00
Weblate
26998e1e18 Merge remote-tracking branch 'origin/master' 2015-11-24 12:13:54 +01:00
Jader Teixeira
9b2ced1783 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.3% (2945 of 3223 strings)

[CI skip]
 2015-11-24 12:13:53 +01:00
Madhura Jayaratne
1c473bf49d Merge pull request #11689 from madhuracj/refactor 
Refactor database related code
 2015-11-24 22:13:47 +11:00
Deven Bansod
d55abcd5ff Fix issue 11684 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-24 15:46:50 +05:30
Madhura Jayaratne
ba8859d7df Merge branch 'master' into refactor 
Conflicts:
	db_create.php
 2015-11-24 21:07:09 +11:00
Madhura Jayaratne
8e282a3f6e Merge build_html_for_db.lib.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:56:04 +11:00
Madhura Jayaratne
0a2b037706 merge db_create.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:41:40 +11:00
Madhura Jayaratne
677ea758ca Template display_create_database.lib.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:12:33 +11:00
Madhura Jayaratne
3cf75085d6 Merge pull request #11676 from madhuracj/refactor 
Refactoring server databases page
 2015-11-24 08:56:43 +11:00
Madhura Jayaratne
62dac7ff0f Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 08:35:12 +11:00
Marc Delisle
881756dd26 Fix library path verification 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-23 08:09:06 -05:00
Marc Delisle
d01d1a7606 Merge branch 'QA_4_5' 2015-11-23 07:23:36 -05:00
Marc Delisle
2b4e6c1dd8 Merge commit '7aa3c47' 2015-11-23 07:23:28 -05:00
Marc Delisle
43fc833a5d 4.5.2 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-23 07:22:38 -05:00
Weblate
bedfc40cba Merge remote-tracking branch 'origin/master' 2015-11-23 12:28:22 +01:00
CV. Gavitha Rantama
50f9ccdfb7 Translated using Weblate (Indonesian) 
Currently translated at 68.7% (2216 of 3223 strings)

[CI skip]
 2015-11-23 12:28:20 +01:00
Weblate
7aa3c47a2f Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-23 12:27:55 +01:00
CV. Gavitha Rantama
e9e9999469 Translated using Weblate (Indonesian) 
Currently translated at 69.5% (2233 of 3211 strings)

[CI skip]
 2015-11-23 12:27:53 +01:00
Madhura Jayaratne
534b13faf5 Do not pass around the generated html unnecessarily 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:41:40 +11:00
Madhura Jayaratne
db66f026b5 Make methods more cohesive 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:36:25 +11:00
Madhura Jayaratne
d11e0275ed Move tr tag to template 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:25:42 +11:00
Madhura Jayaratne
7e800ba504 Template database row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 14:16:30 +11:00
Madhura Jayaratne
02c1e556ae Use templating for table footer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-23 12:24:57 +11:00
Marc Delisle
c3a30a0ad4 Merge branch 'QA_4_5' 2015-11-22 17:44:16 -05:00
Marc Delisle
674c09861c Merge commit 'd4a5fbb' 2015-11-22 17:44:09 -05:00
Marc Delisle
9b34d380b1 Fixes #11685 Warning: Invalid argument supplied for foreach() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-22 17:43:25 -05:00
Weblate
fabb943bcb Merge remote-tracking branch 'origin/master' 2015-11-22 03:09:23 +01:00
Burak Yavuz
8ebdb940b1 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3223 of 3223 strings)

[CI skip]
 2015-11-22 03:09:23 +01:00
Marc Delisle
9d381167f8 Merge branch 'QA_4_5' 2015-11-21 21:08:47 -05:00
Marc Delisle
da025a6448 Merge commit '565e4eb' 2015-11-21 21:08:36 -05:00
Weblate
d4a5fbb59e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-22 03:08:20 +01:00
Burak Yavuz
b63731a093 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-22 03:08:20 +01:00