Marc Delisle
|
0d8a4425d4
|
Merge branch 'QA_4_5'
|
2015-11-25 09:43:46 -05: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 |
|
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 |
|
Victor Volkov
|
9caf350032
|
Translated using Weblate (Russian)
Currently translated at 97.8% (3143 of 3211 strings)
[CI skip]
|
2015-11-22 03:08:20 +01:00 |
|
Dana Akram
|
030422afb4
|
Translated using Weblate (Kurdish Sorani)
Currently translated at 18.3% (589 of 3211 strings)
[CI skip]
|
2015-11-22 03:08:19 +01:00 |
|
Hauke Henningsen
|
0b0d4da02a
|
Translated using Weblate (German)
Currently translated at 100.0% (3211 of 3211 strings)
[CI skip]
|
2015-11-22 03:08:18 +01:00 |
|
Marc Delisle
|
1defe1a68a
|
Merge branch 'MAINT_4_5_2' into QA_4_5
|
2015-11-21 21:07:08 -05:00 |
|
Marc Delisle
|
348c7d734a
|
Fix incorrect message calling
Signed-off-by: Marc Delisle <marc@infomarc.info>
|
2015-11-21 21:06:31 -05:00 |
|
Hugues Peccatte
|
3a9dac5e05
|
Make PHPCS happy.
Fix call to PMA_Util.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
|
2015-11-21 15:07:47 +01:00 |
|
Hugues Peccatte
|
54053550fd
|
Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
|
2015-11-21 15:04:31 +01:00 |
|
Hugues Peccatte
|
3afe570435
|
Merge remote-tracking branch 'origin/master'
|
2015-11-21 14:59:47 +01:00 |
|
Marc Delisle
|
a56d17cf49
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2015-11-21 07:40:40 -05:00 |
|
Marc Delisle
|
a8c6cdc006
|
Fix warnings; remove unneeded variable
Signed-off-by: Marc Delisle <marc@infomarc.info>
|
2015-11-21 07:40:27 -05:00 |
|
Weblate
|
f2c2cedb55
|
Merge remote-tracking branch 'origin/master'
|
2015-11-21 12:50:53 +01:00 |
|
Victor Volkov
|
033e568570
|
Translated using Weblate (Russian)
Currently translated at 96.6% (3114 of 3223 strings)
[CI skip]
|
2015-11-21 12:50:52 +01:00 |
|
Dana Akram
|
148f7fc06c
|
Translated using Weblate (Kurdish Sorani)
Currently translated at 18.1% (586 of 3223 strings)
[CI skip]
|
2015-11-21 12:50:51 +01:00 |
|
Andrey Aleksanyants
|
49feb9f1c7
|
Translated using Weblate (Armenian)
Currently translated at 67.4% (2174 of 3223 strings)
[CI skip]
|
2015-11-21 12:50:48 +01:00 |
|
Marc Delisle
|
e02542d0ba
|
Refactor handling of export template actions
Signed-off-by: Marc Delisle <marc@infomarc.info>
|
2015-11-21 06:50:41 -05:00 |
|
Michal Čihař
|
565e4eb077
|
Translated using Weblate (Persian)
Currently translated at 25.3% (814 of 3211 strings)
[CI skip]
|
2015-11-21 11:45:37 +01:00 |
|
