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

85812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dieter Adriaenssens
e320e565ab Translated using Weblate (Dutch) 
Currently translated at 100.0% (2713 of 2714)
 2013-08-05 12:02:53 +02:00
Michal Čihař
3063535532 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	tbl_tracking.php
 2013-08-05 10:02:09 +02:00
Michal Čihař
6cff5f0c47 Merge commit '55bf30f5a8d236dc13a5c4d7d5d9afe7de6cc311' 2013-08-05 10:01:05 +02:00
Michal Čihař
3a6d29f183 Use PMA_generate_common_url for URL parameters 2013-08-05 10:00:39 +02:00
FliegenKLATSCH
bebe981371 Version-Parameter fixed 
Single Tracking-Entries couldn't be deleted because of missing Version in the Delete-Link.
 2013-08-05 09:58:17 +02:00
Michal Čihař
e3f2fc7759 Merge pull request #566 from FliegenKLATSCH/patch-1 
Version-Parameter fixed
 2013-08-05 00:52:54 -07:00
Michal Čihař
d88b6cc64e Merge pull request #563 from mynetx/demo-footer-repo-link-new-window 
Demo server footer: Open Git links in new window
 2013-08-05 00:51:26 -07:00
Marc Delisle
b0a4eca472 Fix typo 2013-08-04 18:22:14 -04:00
Weblate
33d266c0e7 Merge remote-tracking branch 'origin/master' 2013-08-04 23:52:54 +02:00
Dadan Setia
3601b169eb Translated using Weblate (Indonesian) 
Currently translated at 76.8% (2084 of 2714)
 2013-08-04 23:52:50 +02:00
Dieter Adriaenssens
354cd20631 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2712 of 2714)
 2013-08-04 23:52:46 +02:00
xmujay
d260060106 fix the wrong comment for the case: value is not a number 2013-08-04 17:49:26 -04:00
xmujay
137614355b using better variable name and comments 2013-08-04 17:49:26 -04:00
xmujay
a6d93f2abb fix the typo: varible ==> variable 2013-08-04 17:49:26 -04:00
xmujay
9fb3acebee split the long assertion which failed due to time hard code 2013-08-04 17:49:26 -04:00
xmujay
909fcefb5d UTs for PMA_server_variables 2013-08-04 17:49:26 -04:00
FliegenKLATSCH
511d8ec920 Version-Parameter fixed 
Single Tracking-Entries couldn't be deleted because of missing Version in the Delete-Link.
 2013-08-04 18:20:48 +02:00
Madhura Jayaratne
a84700e151 Merge pull request #553 from ayushchd/unit_testing_2 
UTs and fixes
 2013-08-04 04:17:50 -07:00
Weblate
55bf30f5a8 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-08-04 13:01:58 +02:00
Victor Volkov
0479297269 Translated using Weblate (Russian) 
Currently translated at 99.7% (2600 of 2609)
 2013-08-04 13:01:54 +02:00
도원 권
f8e41310d6 Translated using Weblate (Korean) 
Currently translated at 72.8% (1899 of 2609)
 2013-08-04 13:01:51 +02:00
Marc Delisle
8b772f59ee Merge branch 'QA_4_0' 2013-08-04 07:01:18 -04:00
Marc Delisle
a0431f1edf Merge commit '3051a39' 2013-08-04 07:00:57 -04:00
Marc Delisle
cce1fa2735 Fix merge conflicts 2013-08-04 07:00:04 -04:00
Weblate
f102bbd514 Merge remote-tracking branch 'origin/master' 2013-08-03 21:38:08 +02:00
Victor Volkov
95d67d0890 Translated using Weblate (Russian) 
Currently translated at 97.6% (2649 of 2714)
 2013-08-03 21:38:02 +02:00
J.M
a1a830c2f1 Fix user table ajax add: User group cell missing 2013-08-03 21:37:06 +02:00
ayushchd
ec411d700b Fix test case 2013-08-03 23:03:48 +05:30
ayushchd
9c6041c816 More tests for export libraries 2013-08-03 22:25:17 +05:30
J.M
a21a4ccc1a Demo server footer: Open Git links in new window 2013-08-03 15:59:17 +02:00
J.M
5c25e02ef5 scripts/revision-info: Add GitHub https URL 2013-08-03 15:58:21 +02:00
J.M
80b91b512f Ignore IIS web.config 2013-08-03 15:44:42 +02:00
Isaac Bennetch
91c2523fa2 Merge pull request #555 from kasunchathuranga/unitTesting 
Unit testing
 2013-08-03 06:39:43 -07:00
Isaac Bennetch
20a0b47f97 Merge pull request #560 from kasunchathuranga/uniteTests2 
Unit tests for functions that handle user groups
 2013-08-03 06:32:37 -07:00
Kasun Chathuranga
2f252cc83d Fix failing tests 2013-08-03 17:36:14 +05:30
Kasun Chathuranga
8b5ebb8784 Break different scenarios into different tests 2013-08-03 17:36:12 +05:30
Kasun Chathuranga
6b18c1764b Unit tests for user group manipulation functions 2013-08-03 17:36:11 +05:30
Marc Delisle
ae4f3f81e4 These globals were not used 2013-08-03 05:58:26 -04:00
ayushchd
226e027e5b Merge remote-tracking branch 'upstream/master' into unit_testing_2 2013-08-03 15:12:37 +05:30
Weblate
ac2370f14d Merge remote-tracking branch 'origin/master' 2013-08-03 11:29:58 +02:00
도원 권
e3a899994e Translated using Weblate (Korean) 
Currently translated at 69.3% (1880 of 2714)
 2013-08-03 11:29:53 +02:00
Marc Delisle
a1dc57bfdf We no longer supply a .htaccess in libraries 2013-08-03 05:27:53 -04:00
Marc Delisle
f045c54dae Merge pull request #562 from xmujay/server_refactor2 
refactor server_variables
 2013-08-02 10:06:15 -07:00
xmujay
6e6bd82cd1 remove server_variables_doc.php and add a function to return doc links 2013-08-02 23:08:14 +08:00
Isaac Bennetch
066b753a5a Merge pull request #554 from kasunchathuranga/configurableMenus 
Improvements to configurable menus
 2013-08-02 07:02:55 -07:00
xmujay
be4f83eb96 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2 2013-08-02 21:48:07 +08:00
Marc Delisle
d9fecc136d Fix merge conflicts 2013-08-02 08:27:01 -04:00
Weblate
3051a39f64 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-08-02 14:26:03 +02:00
Dong-bum Kim
c9daa6c74b Translated using Weblate (Korean) 
Currently translated at 72.6% (1895 of 2609)
 2013-08-02 14:25:58 +02:00
Michal Čihař
53ffaa0844 Translated using Weblate (Japanese) 
Currently translated at 95.5% (2491 of 2609)
 2013-08-02 14:25:55 +02:00