ayushchd
2e542c4f95
Group native and mb string functions into classes
2013-06-20 12:30:04 +05:45
Michal Čihař
9bcf95f235
Remove extra parenthesis
2013-06-12 10:57:00 +02:00
Michal Čihař
fab879f924
Simplify reCaptcha configuration
...
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
2013-06-12 09:38:10 +02:00
Michal Čihař
34dce1d3b4
Various coding style improvements
2013-06-11 16:27:31 +02:00
Michal Čihař
3a7139db70
Use shorter notion of server array
2013-06-11 16:00:22 +02:00
Michal Čihař
dfb81b4b92
Coding style improvements
2013-06-11 15:59:23 +02:00
Michal Čihař
d08730780a
Consistent config naming with other config options (issue #369 )
2013-06-11 15:30:14 +02:00
Michal Čihař
65a083f6d4
Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2
...
Conflicts:
libraries/Header.class.php
2013-06-11 15:28:19 +02:00
Michal Čihař
999a898aa3
Merge commit '85e5a3b5cebf5a7479779297bfcb50294f3f8725'
2013-06-11 14:58:48 +02:00
Michal Čihař
85e5a3b5ce
bug #3645 Better handling of invalid ODS documents
2013-06-11 14:58:02 +02:00
Madhura Jayaratne
31d448e7e6
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2013-06-11 17:08:05 +05:30
Madhura Jayaratne
9c681b30af
Rename PMA_import_sessionCheck() -> PMA_Import_sessionCheck()
2013-06-11 17:02:20 +05:30
Madhura Jayaratne
0ecadbba0d
Rename PMA_import_progressCheck() -> PMA_Import_progressCheck()
2013-06-11 17:01:42 +05:30
Madhura Jayaratne
37eaa0a680
rename PMA_import_apcCheck() -> PMA_Import_apcCheck()
2013-06-11 17:00:11 +05:30
Madhura Jayaratne
0dee9a7789
Wrap a long line
2013-06-11 16:58:55 +05:30
Michal Čihař
0ee0d8e8c5
bug #3962 Proper escaping of JSON export
...
We now use json_encode instead of home made encoder. Also we now
generate JSON data on the fly, what reduces memory usage.
2013-06-11 11:49:02 +02:00
Marc Delisle
47652894f7
Merge branch 'QA_4_0'
2013-06-10 13:01:22 -04:00
Kari Söderholm
0181fa9400
Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins.
2013-06-10 12:57:27 -04:00
Marc Delisle
e6b1391af9
Fix merge conflicts
2013-05-28 08:49:37 -04:00
Marc Delisle
ec6a47d8a0
bug #3957 Cookies must be enabled past this point
2013-05-28 08:46:04 -04:00
Marc Delisle
c9eb61b18e
Use CodeMirror to highlight the SQL transformation
2013-05-27 12:37:17 -04:00
Madhura Jayaratne
2baf473ad7
Merge branch 'master' into OOP_DBI
...
Conflicts:
libraries/database_interface.lib.php
2013-05-26 21:43:33 +05:30
Madhura Jayaratne
3dd99512f0
These constants are better as a part of DatabaseInterface class
2013-05-26 21:15:24 +05:30
Marc Delisle
b8e4f346a5
Clarify function name
2013-05-26 11:34:43 -04:00
Madhura Jayaratne
650a8cdda3
Convert database interface to a class
2013-05-24 17:30:59 +05:30
Marc Delisle
140eb64350
Merge commit '078da8d'
2013-05-23 02:57:02 -04:00
Marc Delisle
078da8d57f
bug #3933 Do not translate "Open Document" in export settings
2013-05-23 02:54:47 -04:00
Bojan Petkovski
95f5df348d
Recaptcha bug fixes
...
Error message for empty captcha "Please enter correct captcha!" and if
the user enters correct captcha but wrong login data it won't be
required to enter it next time.
2013-05-20 22:43:07 +02:00
Madhura Jayaratne
d7db600379
Merge branch 'QA_4_0'
2013-05-20 17:53:15 +05:30
Madhura Jayaratne
b3e6f8cee7
bug #3924 Show warning when CSV file does not contain data for all columns
2013-05-20 17:50:19 +05:30
Marc Delisle
a51604e226
Merge branch 'QA_4_0'
2013-05-20 08:11:28 -04:00
Marc Delisle
e72f1a0daa
Merge pull request #395 from ayusun/exportsqlupdate
...
creating database while exporting at database level
2013-05-20 05:08:21 -07:00
Marc Delisle
4bdd15fd33
Fix merge conflicts
2013-05-19 08:55:36 -04:00
Marc Delisle
9b61212b48
bug #3946 Missing CSV import option "Do not abort on INSERT error"
2013-05-19 08:44:45 -04:00
ayusun
d8b9a0b28c
creating database while exporting at database level
2013-05-16 20:52:50 +05:30
Marc Delisle
d44367e4db
Fix merge conflicts
2013-05-15 13:07:22 -04:00
Marc Delisle
920d827c37
Merge pull request #379 from mynetx/bug-3907
...
Fix most analysis results discovered in bug 3907
2013-05-15 09:52:03 -07:00
Madhura Jayaratne
77e31ceeb6
Use single indentation (4 spaces)
2013-05-14 23:54:05 +05:30
Marc Delisle
ef62569540
Fix merge conflict
2013-05-14 14:13:32 -04:00
ayusun
25e71b71da
Bug fix #3910 with updated code indentation
2013-05-14 22:40:39 +05:30
ayusun
44dd0e8405
Bug fix 3910. Updated Export plugin to support zero rows
2013-05-13 15:16:46 +05:30
J.M
529903e0dd
Fix bug #3907 undefined variables, function parameter problems
...
Thanks Rasmus Lerdorf for analyzing!
2013-05-13 11:27:56 +02:00
Marc Delisle
13c6e82551
Fix merge conflicts
2013-05-12 08:18:08 -04:00
Marc Delisle
4113d9e98b
bug #3915 Import of CSV file (Replace table data with file) with duplicate values
2013-05-12 08:09:02 -04:00
Bojan Petkovski
4213c3c285
ReCaptcha error message
2013-05-12 13:33:09 +02:00
Bojan Petkovski
e9f5a30ae5
ReCaptcha https and CSP bug fixes
2013-05-11 17:53:34 +02:00
Bojan Petkovski
1832c8fa33
ReCaptcha feature
2013-05-11 17:53:32 +02:00
Michal Čihař
e45b211f6a
Avoid need to store data again
2013-05-10 10:15:27 +02:00
Michal Čihař
025589f6aa
Different name for each plugin
2013-05-10 10:12:45 +02:00
Michal Čihař
325d423abc
Drop compatibility with older TCPDF using empty_string
2013-05-10 09:27:48 +02:00
