Dieter Adriaenssens
0b86704892
fix coding style : wrap long lines
2013-09-24 15:33:21 +02:00
Dieter Adriaenssens
ccd9835347
offset is a global var
2013-09-17 15:40:51 +02:00
Dieter Adriaenssens
d0d419fe8d
display esri-type in message
2013-09-17 13:52:07 +02:00
Madhura Jayaratne
5638d6b956
Merge branch 'QA_4_0'
2013-09-17 16:51:07 +05:30
Madhura Jayaratne
f9300c7b07
bug #4001 Import error: Class 'ImportOds' not found
2013-09-17 16:49:06 +05:30
Michal Čihař
3fef046acf
Do not set memory limit in SHP import as well
...
- First of all current detection is wrong and it will fail on values as
65536K.
- Also I see no reason why single import should override global settings
we have.
2013-09-16 09:19:42 +02:00
Michal Čihař
db178d62c2
Avoid hardcoded time limit in SHP import
2013-09-16 09:17:05 +02:00
Madhura Jayaratne
2897c93b58
Add types
2013-08-27 23:37:52 +05:30
J.M
ac05fec3fa
Use input type=number
2013-08-18 15:39:51 +02:00
Michal Čihař
9d00e5934c
Merge pull request #571 from ayushchd/ut
...
Ut
2013-08-13 06:35:23 -07:00
Michal Čihař
0a3d1d5be8
Better names for URL generating functions
2013-08-07 10:58:17 +02:00
Michal Čihař
8e71b13ced
CS compliant transformation helper functions
2013-08-07 10:53:09 +02:00
ayushchd
6eced72d93
Fix uninitialized variable issue
2013-08-06 23:58:29 +05:30
Michal Čihař
9310e76a0e
Fix indentation
2013-07-30 13:23:51 +02:00
Kasun Chathuranga
94ff649d0d
Fix undefined index notices on sql_views_as_tables
2013-07-30 07:20:35 +05:30
Kasun Chathuranga
f14e777e87
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into exportView
2013-07-29 09:07:42 +05:30
Kasun Chathuranga
558c4df1bb
Allow exporting views as if they were tables
2013-07-29 09:06:09 +05:30
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
Kasun Chathuranga
f94df61e97
Wrap lines exceeding 85 characters
2013-07-24 12:14:21 +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
