gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,297 Commits 12 Branches 481 Tags 2.4 GiB
3c49b201e9
Commit Graph

87297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
3c49b201e9 Fix merge conflict 2013-10-02 06:15:39 -04:00
Marc Delisle
c91e9b1b4f Merge branch 'QA_4_0' 2013-10-02 06:14:47 -04:00
Marc Delisle
385e3274be 4.0.9-dev 2013-10-02 06:14:02 -04:00
Weblate
a2235b67c5 Merge remote-tracking branch 'origin/master' 2013-10-02 12:07:29 +02:00
Giovanni Sora
c2e7f03a14 Translated using Weblate (Interlingua) 
Currently translated at 25.2% (691 of 2744)
 2013-10-02 12:07:25 +02:00
Michal Čihař
50deebcbdf Coding style: Bad line breaking before logical operators 2013-10-02 12:07:15 +02:00
Michal Čihař
0040765b4e Coding style: Declare before used 2013-10-02 12:07:15 +02:00
Michal Čihař
51bb5ffc31 Coding style: Declare before used and add function comments 2013-10-02 12:07:14 +02:00
Weblate
5671039ba2 Merge remote-tracking branch 'origin/master' 2013-10-02 11:46:47 +02:00
Michal Čihař
c3a7aa28b4 Translated using Weblate (Czech) 
Currently translated at 99.4% (2728 of 2744)
 2013-10-02 11:46:42 +02:00
Michal Čihař
4f5a9e40a2 Coding style: line breaking before + 2013-10-02 11:45:46 +02:00
Michal Čihař
424e2ee75b Coding style: use type safe comparing for blank values 2013-10-02 11:45:46 +02:00
Michal Čihař
bf4b0c8162 Coding style: spaces around operator 2013-10-02 11:45:45 +02:00
Michal Čihař
58d7005a42 Coding style: wrap long lines 2013-10-02 11:45:45 +02:00
Michal Čihař
0ad8a147c5 Coding style: wrap long line 2013-10-02 11:45:45 +02:00
Michal Čihař
9985f1ceb6 Add missing comment 2013-10-02 11:45:45 +02:00
Weblate
093c171af4 Merge remote-tracking branch 'origin/master' 2013-10-02 10:12:30 +02:00
jef suris
7c1eebce9d Translated using Weblate (Greek) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-02 10:12:26 +02:00
Michal Čihař
8d8b363221 Merge branch 'license-fixes' of git://github.com/bkuhn/phpmyadmin 2013-10-02 10:11:50 +02:00
Kristjan Räts
6e0b5e4e1b Translated using Weblate (Estonian) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-02 09:42:58 +02:00
Weblate
6e8221126f Merge remote-tracking branch 'origin/master' 2013-10-02 03:57:58 +02:00
Helder Santana
24ebd34a31 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-02 03:57:53 +02:00
Dieter Adriaenssens
82dac0f0ab Translated using Weblate (Dutch) 
Currently translated at 99.8% (2738 of 2744)
 2013-10-02 03:57:48 +02:00
Madhura Jayaratne
3b2d624ce2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-10-02 07:26:49 +05:30
Madhura Jayaratne
a0b299b758 Merge branch 'QA_4_0' 
Conflicts:
	ChangeLog
	js/tbl_change.js
	po/pt_BR.po
 2013-10-02 07:24:56 +05:30
Weblate
63c87b82ee Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-10-02 03:48:29 +02:00
Helder Santana
35ad381cdd Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2611 of 2611)
 2013-10-02 03:48:25 +02:00
Madhura Jayaratne
58e196045e Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 
Conflicts:
	ChangeLog
 2013-10-02 07:17:46 +05:30
Madhura Jayaratne
ae3eef1b9f bug #3992 Multi-row edit doesn't clear values when checking NULL 2013-10-02 07:11:27 +05:30
Madhura Jayaratne
2f763b7a4a Drizzle does not support show full tables queries 2013-10-02 06:59:53 +05:30
Matías Bellone
272a658412 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-02 02:12:41 +02:00
Rodrigo Souza
9f0b3a457b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2611 of 2611)
 2013-10-02 01:56:56 +02:00
Rodrigo Souza
d2d35b8bfb Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-02 01:56:43 +02:00
Panagiotis Papazoglou
d0d81f11b7 Translated using Weblate (Greek) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-01 22:51:41 +02:00
Helder Santana
3ee0fc7906 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-01 22:22:45 +02:00
Rodrigo Souza
d756872e80 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2611 of 2611)
 2013-10-01 22:21:55 +02:00
Rodrigo Souza
c2a1fbd1a1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2743 of 2744)
 2013-10-01 22:21:48 +02:00
Helder Santana
d22d71550f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.4% (2727 of 2744)
 2013-10-01 22:12:50 +02:00
Rodrigo Souza
5a0020e5e9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.3% (2725 of 2744)
 2013-10-01 22:11:58 +02:00
Burak Yavuz
111ca39f41 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-01 21:31:53 +02:00
Dieter Adriaenssens
fd59a3a7b3 Update po files 2013-10-01 21:11:25 +02:00
Dieter Adriaenssens
5028d8e716 improve message 2013-10-01 21:11:02 +02:00
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
Domen
fa6804813c Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2744 of 2744)
 2013-10-01 17:10:51 +02: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