gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,429 Commits 12 Branches 481 Tags 2.4 GiB
220a67f6c3
Commit Graph

335 Commits

Author SHA1 Message Date
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 22:13:10 +01:00
Hugues Peccatte
d27076392c Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 20:44:12 +01:00
Hugues Peccatte
20ab7112bb Fix PHPCS errors/warnings from Jenkins. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-10 21:57:17 +01:00
Hugues Peccatte
2274453717 Minor PHPDoc modifications. 2013-12-07 19:00:53 +01:00
Marc Delisle
bb9d07e0b8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 08:06:37 -05:00
Marc Delisle
4f612de31d Remove unneeded transformation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:31:47 -05:00
Rob Lewis
ab22ae90e9 rfe #1474 Text transformation combines Append and Prepend 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-06 06:13:06 -05:00
Marc Delisle
b7d8bd7dea - Fix coding style 
- Add ChangeLog entry
 2013-12-03 12:47:45 -05:00
Rob Lewis
196b720b7d RFE #1473 Transformation to convert Boolean value to text 2013-12-03 12:40:57 -05:00
Marc Delisle
7411185bd6 Fix coding style 2013-12-03 06:18:14 -05:00
Marc Delisle
1615fe1180 We now use gettext 2013-11-22 12:59:51 -05:00
Marc Delisle
9ad4e64719 Fix coding style 2013-11-22 05:26:45 -05:00
Marc Delisle
ca053deb24 Merge pull request #765 from slimtim/bug_4153 
When importing a SQL file convert \r line-endings to \n
 2013-11-21 04:16:11 -08:00
Marc Delisle
088b0f7818 Fix coding style 2013-11-21 06:51:52 -05:00
slimtim
f604be8bd2 When importing a SQL file convert carriage return (\r) line-endings to line feeds (\n) otherwise all queries in the file may not get executed on some platforms (e.g. Linux) 2013-11-20 21:44:48 -05:00
slimtim
2e7c024df6 When importing a CSV file force a trailing new line at EOF to prevent parsing problems. (bug #4133) 2013-11-20 16:43:01 -05:00
Marc Delisle
5f5b49d27e Merge pull request #749 from Tithugues/fix-unitialized 
Minor: Fix unitialized variables
 2013-11-11 11:02:21 -08:00
Hugues Peccatte
7e1e6e5691 Add initialization of some variables and useless code. 2013-11-11 18:56:46 +01:00
Madhura Jayaratne
26249a17fe Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-11 22:58:46 +05:30
Madhura Jayaratne
5bf243b8e6 Specify types 2013-11-11 07:14:37 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Hugues Peccatte
d3601abf96 Global PHPDoc update. 2013-11-10 12:29:55 +01:00
Hugues Peccatte
ca8eb087cc Revert third party modifications. 2013-11-09 11:04:52 +01:00
Hugues Peccatte
1f09a22281 Fix PHPDoc. 2013-11-08 22:41:05 +01:00
Madhura Jayaratne
20608589c3 Remove trailing white spaces 2013-10-19 14:29:05 +05:30
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
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