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

291 Commits

Author SHA1 Message Date
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
Marc Delisle
dc92c72e8a Merge commit '77e67c3' 2013-07-19 09:13:51 -04:00
Marc Delisle
77e67c3f2c - bug #4019 Create database if not exists (export): add an option to the 
interface to enable generating CREATE DATABASE and USE (false by default)
 2013-07-19 09:09:24 -04:00
Marc Delisle
90d968b447 Fix merge conflicts 2013-07-17 15:18:09 -04:00
ayushchd
6f2a532bf0 Tests for AuthenticationHttp and AuthenticationSignon 2013-07-17 17:33:09 +05:45
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
ayushchd
7312cd5b01 Tests for AuthenticationConfig and AuthenticationCookie 2013-07-16 21:44:49 +05:45
Michal Čihař
df3502e804 Another adding of comma to sentences 2013-07-12 15:54:18 +02:00
Michal Čihař
31a1167f19 End sentence with a stop 2013-07-12 14:58:09 +02:00
Dieter Adriaenssens
6b7d1d813a Fix bug #3625 with a workaround, revert this commit when PMA drops support for PHP 5.3 2013-07-11 12:45:00 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables 
Found by PMD on our CI server
 2013-07-10 14:53:05 +02:00
Michal Čihař
e51f32d001 Properly set global message 2013-07-10 14:53:05 +02:00
Michal Čihař
dc809d6a8d Properly use global offset variable 2013-07-10 14:53:04 +02:00
Michal Čihař
af2882bd9d Drop unused private attributes 2013-07-10 14:53:04 +02:00
Michal Čihař
7fced0d26c Correctly pass usernam in signon auth 2013-07-10 14:53:04 +02:00
Michal Čihař
0e02a35d2e Revert "Temporary workaround for bug #3783 :" 
This reverts commit 2683f32033.
 2013-07-01 15:29:56 +02:00
Michal Čihař
37d142bc3f Remove compatibility code for PHP 5.2 2013-07-01 15:29:56 +02:00
Dieter Adriaenssens
4f63bb6bf1 Merge branch 'QA_4_0' 2013-06-24 13:30:11 +02:00
Dieter Adriaenssens
d0c0d0d207 fix typo 2013-06-24 13:29:36 +02:00
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