Commit Graph

100667 Commits

Author SHA1 Message Date
Madhura Jayaratne
dd3cd6bb24 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-29 13:33:30 +05:30
Madhura Jayaratne
ab17ab5ab9 ChangeLog entry for bug #4916
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-29 13:32:20 +05:30
Weblate
36c10e96f2 Merge remote-tracking branch 'origin/master' 2015-06-29 10:01:12 +02:00
Giovanni Sora
5cd289d42c Translated using Weblate (Interlingua)
Currently translated at 69.6% (2188 of 3142 strings)

[CI skip]
2015-06-29 10:01:08 +02:00
Valter Georgiev
1637382787 Translated using Weblate (Bulgarian)
Currently translated at 62.0% (1950 of 3142 strings)

[CI skip]
2015-06-29 10:01:06 +02:00
Arben Çokaj
fc4c62d6b6 Translated using Weblate (Albanian)
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
2015-06-29 10:01:05 +02:00
Madhura Jayaratne
047b962d6e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-29 13:26:55 +05:30
Madhura Jayaratne
0a0879ea1e Upgrade CodeMirror to version 5.4.0
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-29 13:19:42 +05:30
Kristjan Räts
7b6e1d8f5f Translated using Weblate (Estonian)
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
2015-06-29 08:33:24 +02:00
Burak Yavuz
68116ae860 Translated using Weblate (Turkish)
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
2015-06-29 06:10:00 +02:00
Arben Çokaj
e46c645837 Translated using Weblate (Albanian)
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
2015-06-29 00:57:48 +02:00
Balázs Úr
8053c64c28 Translated using Weblate (Hungarian)
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
2015-06-28 23:09:53 +02:00
Domen
50649af88e Translated using Weblate (Slovenian)
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
2015-06-28 15:32:36 +02:00
Marc Delisle
d8861570f4 Clarify boolean method name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-28 06:33:29 -04:00
Marc Delisle
862d32716f Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-28 06:20:55 -04:00
Arben Çokaj
29e4dc69dc Translated using Weblate (Albanian)
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
2015-06-27 23:51:32 +02:00
Marc Delisle
554913ac71 Merge pull request #1763 from nisargjhaveri/rfe_1603
rfe#1603 select structure or data for each table when exporting
2015-06-27 07:46:17 -04:00
Nisarg Jhaveri
9ef59e49e5 rfe#1603 select structure or data for each table when exporting
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-06-27 17:09:59 +05:30
Marc Delisle
87b55b881a Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.2% (3036 of 3123 strings)

[CI skip]
2015-06-27 11:54:10 +02:00
Marc Delisle
4b936719dd Move function definition before function call
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-27 05:43:13 -04:00
Weblate
bde0393fcd Merge remote-tracking branch 'origin/master' 2015-06-27 11:20:06 +02:00
Franco
126face92b Translated using Weblate (Spanish)
Currently translated at 99.4% (3108 of 3125 strings)

[CI skip]
2015-06-27 11:20:01 +02:00
Renato Rodrigues de Lima Júnio
3b954d6fdc Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.2% (3036 of 3123 strings)

[CI skip]
2015-06-27 11:19:58 +02:00
Marc Delisle
1f2891e05f Instructions for new incremental release notes
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-27 05:19:49 -04:00
Stefano Martinelli
de0f48d443 Translated using Weblate (Italian)
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
2015-06-27 10:58:15 +02:00
Marco Pozzato
1ef3f0c7e2 Translated using Weblate (Italian)
Currently translated at 99.9% (3122 of 3125 strings)

[CI skip]
2015-06-27 10:57:11 +02:00
Kristjan Räts
0c9a6fd4e0 Translated using Weblate (Estonian)
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
2015-06-26 19:46:55 +02:00
Marc Delisle
659e0c3722 - Move count() outside of loop
- Clarify variable name

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-26 07:37:03 -04:00
Madhura Jayaratne
8403329670 Preserver preference auto loading notice
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-26 14:20:45 +05:30
Madhura Jayaratne
f8120cc084 Add left margin for preference auto loading notice
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-26 14:18:27 +05:30
Madhura Jayaratne
cb90efe029 Merge branch 'QA_4_4' 2015-06-26 14:14:34 +05:30
Madhura Jayaratne
9aa15746bc Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-26 14:11:37 +05:30
Madhura Jayaratne
2aea2b8902 Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-26 14:10:25 +05:30
Weblate
c82ea05c99 Merge remote-tracking branch 'origin/master' 2015-06-26 10:38:43 +02:00
Renato Rodrigues de Lima Júnio
37b82c246d Translated using Weblate (Portuguese (Brazil))
Currently translated at 97.0% (3032 of 3123 strings)

[CI skip]
2015-06-26 10:38:40 +02:00
Madhura Jayaratne
894ff19c49 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-26 14:07:50 +05:30
Madhura Jayaratne
d9afc6a7ec Merge branch 'QA_4_4' 2015-06-26 14:07:00 +05:30
Weblate
a3edd0b7dd Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-26 10:34:56 +02:00
Renato Rodrigues de Lima Júnio
b47b1dc2e6 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (3029 of 3035 strings)

[CI skip]
2015-06-26 10:34:53 +02:00
Madhura Jayaratne
beaa73274f Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-26 14:04:38 +05:30
Madhura Jayaratne
e453cb818b bug #4969 Autoload from prefs_storage not behaving properly
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-26 14:03:18 +05:30
Marc Delisle
e721080899 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-06-25 08:33:33 -04:00
Madhura Jayaratne
ad01805ecc ChangeLog entry for rfe #1561
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-25 17:55:21 +05:30
Madhura Jayaratne
920ff9a47e Merge pull request #1762 from madhuracj/rfe1561
RFE #1561 Being able to use multiple servers at the same time when using cookie auth
2015-06-25 17:49:40 +05:30
Madhura Jayaratne
01354d9d95 #1561 Being able to use multiple servers at the same time when using cookie auth
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-25 17:33:18 +05:30
Domen
e146b4dfc8 Translated using Weblate (Slovenian)
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
2015-06-25 11:36:01 +02:00
Madhura Jayaratne
679015ea52 rfe #1552 CSV import: Allow "Columns escaped with" to be optional
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-25 12:58:48 +05:30
Madhura Jayaratne
6f4e0b2a77 rfe #1531 Cant use external config file
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-25 12:18:17 +05:30
Madhura Jayaratne
8a567b7b66 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-25 11:44:30 +05:30
Madhura Jayaratne
15a3686fd3 Better text for the submit button
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-25 11:42:50 +05:30