Commit Graph

87254 Commits

Author SHA1 Message Date
Bradley M. Kuhn
5338162fee Correct and complete license notices for bfShapeFiles.
I downloaded bfShapeFiles from http://bfshapefiles.sourceforge.net/
Exact URL was:
  http://softlayer-dal.dl.sourceforge.net/project/bfshapefiles/bfshapefiles/0.0.2/bfShapeFiles-0.0.2.zip
  and the sha256sum of that zip file was 40c3e575397cede5342493ca12950fb0e2e9ef6b1e7fd1bf1337e9ac9f24f11c

I see that the file in that zip file named
bfShapeFiles-0.0.2/lib/ShapeFile.lib.php appears to be nearly identical to
this ShapeFile.lib.php in the phpMyAdmin repository.

Thus, I have taken the copyright and license notice from
bfShapeFiles-0.0.2/README.TXT and included it herein, so that full copyright
notice is properly displayed.

Furthermore, I note that since the notice does not refer to a specific
version of the GNU GPL, and that bfShapeFiles-0.0.2/GPL.TXT includes a copy
of GPLv2.  This means that per GPLv2§9, the
bfShapeFiles-0.0.2/lib/ShapeFile.lib.php was licensed to the phpMyAdmin
project under GPLv2-or-later.  I have thusly updated the @license link to so
indicate.
2013-10-01 12:10:29 -04:00
Bradley M. Kuhn
1e27b20a8b Reminder for developers to update jQuery sources when updating minified version.
Sources in js/jquery/src should be updated along with any updates to the
minified/concatenated version, so that the sources always correspond
properly.
2013-10-01 11:25:41 -04:00
Madhura Jayaratne
4b16b5938f #4043 User group privs editor: Check all box not preselected 2013-10-01 18:31:37 +05:30
Madhura Jayaratne
878488d469 Do not hard code PMA version in tests 2013-10-01 17:39:37 +05:30
Madhura Jayaratne
895cf76adf Do not fail on invalid regular expression for filtering 2013-10-01 17:16:39 +05:30
Burak Yavuz
5be4e754bc Translated using Weblate (Turkish)
Currently translated at 100.0% (2744 of 2744)
2013-10-01 12:47:58 +02:00
Atul Pratap Singh
8ac6d76c08 Merge branch 'QA_4_0' 2013-10-01 16:23:02 +05:30
Weblate
191ea111c9 Merge remote-tracking branch 'origin/master' 2013-10-01 12:38:23 +02:00
Atul Pratap Singh
38d92b7875 Fix bug 4105: More disappears in table Structure 2013-10-01 16:16:34 +05:30
Burak Yavuz
d723e12825 Translated using Weblate (Turkish)
Currently translated at 100.0% (2743 of 2744)
2013-10-01 12:38:18 +02:00
Atul Pratap Singh
72cf44f6d1 Remove unused parameter 2013-10-01 15:59:43 +05:30
Marc Delisle
73f4d166db Seems like a bash-specific feature is needed 2013-10-01 06:13:20 -04:00
Marc Delisle
f72374447c Use standard shell path 2013-10-01 06:08:44 -04:00
Marc Delisle
f3c28953d1 Fix merge conflict 2013-10-01 06:02:16 -04:00
Weblate
d6b295b3e0 Merge remote-tracking branch 'origin/master' 2013-10-01 11:40:31 +02:00
Burak Yavuz
262ef8b50c Translated using Weblate (Turkish)
Currently translated at 99.9% (2741 of 2744)
2013-10-01 11:40:26 +02:00
Dieter Adriaenssens
88b191533a Translated using Weblate (Dutch)
Currently translated at 99.5% (2730 of 2744)
2013-10-01 11:40:19 +02:00
Marc Delisle
c1f0afecdf 4.1.0-alpha1 2013-10-01 05:39:36 -04:00
Atul Pratap Singh
37eccc8e42 Fix bug 4105: More disappears in table Structure 2013-10-01 11:45:38 +05:30
Kristjan Räts
f34edbfbd7 Translated using Weblate (Estonian)
Currently translated at 100.0% (2744 of 2744)
2013-09-30 22:49:44 +02:00
Matías Bellone
72ba3395e5 Translated using Weblate (Spanish)
Currently translated at 100.0% (2744 of 2744)
2013-09-30 18:11:49 +02:00
Weblate
a3419b5927 Merge remote-tracking branch 'origin/master' 2013-09-30 17:40:01 +02:00
Guillermo Lisotti
ee2e456e38 Translated using Weblate (Spanish)
Currently translated at 100.0% (2723 of 2724)
2013-09-30 17:39:57 +02:00
Helder Santana
9535383561 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.7% (2716 of 2724)
2013-09-30 17:39:53 +02:00
Dieter Adriaenssens
b39eeed1b8 Translated using Weblate (Dutch)
Currently translated at 99.5% (2730 of 2744)
2013-09-30 17:39:50 +02:00
Dieter Adriaenssens
0f1d91e287 Update po files 2013-09-30 17:39:20 +02:00
Dieter Adriaenssens
34a75e0b11 fix typo 2013-09-30 17:37:57 +02:00
Michal Čihař
63e003a5d4 Translated using Weblate (Czech)
Currently translated at 100.0% (2722 of 2722)
2013-09-30 15:54:28 +02:00
Michal Čihař
9dbf6cb218 Update TCPDF to 6.0.036
Full changelog:

6.0.036 (2013-09-29)
	- Methods for registration bars and crop marks were extended to support registration color (see example n. 56).
	- New default spot colors were added to tcpdf_colors.php, including the 'All' and 'None' special registration colors.

6.0.035 (2013-09-25)
	- TCPDF_PARSER class was improved.

6.0.034 (2013-09-24)
	- Bug #839 "Error in xref parsing in mixed newline chars" was fixed.

6.0.033 (2013-09-23)
	- Bug fix related to PNG image transparency using GD library.

6.0.032 (2013-09-23)
	- Bug #838 "Fatal error when imagick cannot handle the image, even though GD is available and can" was fixed.

6.0.031 (2013-09-18)
	- Bug #836 "Optional EOL marker before endstream" was fixed.
	- Some additional controls were added to avoid "division by zero" error with badly formatted input.

6.0.030 (2013-09-17)
	- Bug #835 "PDF417 and Cyrilic simbols" was fixed.

6.0.029 (2013-09-15)
	- Constants K_TCPDF_PARSER_THROW_EXCEPTION_ERROR and K_TCPDF_PARSER_IGNORE_DECODING_ERRORS where removed in favor of a new configuration array in the TCPDF_PARSER class.
	- The TCPDF_PARSER class can now be configured using the new $cfg parameter.

6.0.028 (2013-09-15)
	- A debug print_r was removed form tcpdf_parser.php.
	- TCPDF_FILTERS class now throws an exception in case of error.
	- TCPDF_PARSER class now throws an exception in case of error unless you define the constant K_TCPDF_PARSER_THROW_EXCEPTION_ERROR to false.
	- The constant K_TCPDF_PARSER_IGNORE_DECODING_ERRORS can be set to tru eto ignore decoding errors on TCPDF_PARSER.

6.0.027 (2013-09-14)
	- A bug in tcpdf_parser wen parsing hexadecimal strings was fixed.
	- A bug in tcpdf_parser wen looking for statxref was fixed.
	- A bug on RC4 encryption was fixed.

6.0.026 (2013-09-14)
	- A bug in tcpdf_parser wen decoding streams was fixed.

6.0.025 (2013-09-04)
	- A pregSplit() bug was fixed.
	- Improved content loading from URLs.
	- Improved font path loading.
2013-09-30 14:21:53 +02:00
Michal Čihař
c0b5286562 Merge branch 'master' of git://github.com/thesocialgeek/phpmyadmin into thesocialgeek-master
Conflicts:
	js/navigation.js
2013-09-30 14:16:40 +02:00
Michal Čihař
d63843356e Update po files 2013-09-30 14:07:29 +02:00
Kamran
6c22016fa4 Code Optimization: Removing un-needed method call to toLowerCase() 2013-09-30 14:05:53 +02:00
Marc Delisle
629b0b6162 Clarify that this was a temporary variable 2013-09-30 07:49:02 -04:00
Marc Delisle
949b5b0042 Merge pull request #724 from xmujay/fixbug_4110
fix bug 4110: PMA_getHtmlForDatabaseList will change the value of $column_order
2013-09-30 04:46:08 -07:00
Michal Čihař
72e89ac68b Merge remote-tracking branch 'origin/QA_4_0' 2013-09-30 11:47:05 +02:00
Helder Santana
4341115ece Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2610 of 2611)
2013-09-30 11:46:13 +02:00
Kristjan Räts
9a5450a898 Translated using Weblate (Estonian)
Currently translated at 100.0% (2722 of 2722)
2013-09-30 11:39:39 +02:00
Michal Čihař
eb86ce0416 Coding style: whitespace around operators 2013-09-30 11:25:23 +02:00
Michal Čihař
26e990169f Coding style: whitespace around operators 2013-09-30 11:24:11 +02:00
Michal Čihař
501cb5a743 Coding style: use {} for if statements 2013-09-30 11:22:24 +02:00
Michal Čihař
65aa3af8ff Coding style: whitespace after keyword 2013-09-30 11:21:09 +02:00
Michal Čihař
0f898c2758 Coding style: missing semicolon 2013-09-30 11:20:43 +02:00
Michal Čihař
555b2fcc8a Coding style: fixed indentation 2013-09-30 11:20:15 +02:00
Michal Čihař
a0f87154f7 Coding style: fixed whitespace 2013-09-30 11:18:07 +02:00
Michal Čihař
127b2488f1 Add missing semicolons 2013-09-30 11:16:31 +02:00
Michal Čihař
e45b0aea08 Remove extra , 2013-09-30 11:14:27 +02:00
Michal Čihař
68fd6dd6b0 Add missing space 2013-09-30 11:14:03 +02:00
Michal Čihař
addb363cdb Move tracekit library to separate folder
This makes it somehow separated from our code
2013-09-30 09:17:03 +02:00
Michal Čihař
31169d72de Fixed spacing in javascript code 2013-09-30 09:15:44 +02:00
Michal Čihař
1a56713e1d Fix typo in CSS 2013-09-30 09:06:31 +02:00