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

98898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
bbba7d3709 Merge branch 'QA_4_4' 2015-04-03 07:31:09 -04:00
Marc Delisle
64c9195393 4.4.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 07:30:43 -04:00
Marc Delisle
ed6976a83e This fix goes to 4.4.2 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 07:29:22 -04:00
Marc Delisle
bc7629f5f9 Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 2015-04-03 07:27:16 -04:00
Marc Delisle
14941285b9 4.4.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 07:27:13 -04:00
Madhura Jayaratne
133a93d383 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-03 16:05:16 +05:30
Madhura Jayaratne
0a21c9b097 Merge branch 'QA_4_4' 2015-04-03 16:04:08 +05:30
Madhura Jayaratne
61432b77ea bug #4835 PMA_hideShowConnection not called after submit_num_fields 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 16:03:18 +05:30
Marc Delisle
258de9cfee Translated using Weblate (French) 
Currently translated at 100.0% (3054 of 3054 strings)

[CI skip]
 2015-04-03 12:23:50 +02:00
Madhura Jayaratne
07220f81fe Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-03 15:36:41 +05:30
Madhura Jayaratne
8b1cbaf988 rfe #1635 Have ZeroConf create phpmyadmin DB if possible 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 15:32:36 +05:30
Marc Delisle
5aa8097ff8 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:47:46 -04:00
Marc Delisle
1353a79720 Respect our message style (second attempt) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:47:10 -04:00
Marc Delisle
e54133575c Revert "Respect our message style" 
This reverts commit 5b768a115d.
 2015-04-03 05:43:23 -04:00
Marc Delisle
5b768a115d Respect our message style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-03 05:40:03 -04:00
Madhura Jayaratne
927b95bc23 Merge branch 'QA_4_4' 2015-04-03 12:29:43 +05:30
Madhura Jayaratne
744e9f42e4 bug #4834 Do not attach token to css requests to improve caching 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 12:28:50 +05:30
Madhura Jayaratne
dc07fb8b3b Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 10:29:18 +05:30
Madhura Jayaratne
7b16d62d09 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 10:27:07 +05:30
Madhura Jayaratne
8d8a90288a bug #4832 Sorting distinct values result loses links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-03 10:25:29 +05:30
Domen
f6ecf86629 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3050 of 3050 strings)

[CI skip]
 2015-04-03 05:25:07 +02:00
Domen
b497eb5672 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-03 05:22:12 +02:00
Marc Delisle
f9d76e39e0 Merge branch 'QA_4_4' 2015-04-02 16:11:25 -04:00
Marc Delisle
8d16b2d937 bug #4822 Compress when php.ini output_buffering is active 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-02 16:10:34 -04:00
Marc Delisle
d208cb47d6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-02 15:37:11 -04:00
Marc Delisle
ca652921bb Merge pull request #1627 from whitepiegon/masterFeature1 
feature 844 structure in PDF export
 2015-04-02 15:34:58 -04:00
Aayush Anand
4b9ef9a757 feature 844 structure in PDF export squashed 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2015-04-03 00:51:33 +05:30
Madhura Jayaratne
96c4bd58d2 Merge branch 'QA_4_4' 2015-04-02 22:50:44 +05:30
Madhura Jayaratne
8f1700d1eb Add additional allowed urls for recaptcha 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 22:48:44 +05:30
Marc Delisle
77542d0b5a Merge branch 'QA_4_4' 2015-04-02 09:00:14 -04:00
Marc Delisle
7fe2b09a03 Merge commit 'deaeab2' 2015-04-02 09:00:08 -04:00
Marc Delisle
e70a4f92a5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-02 08:59:38 -04:00
Dan Ungureanu
502b91d861 BUG #4827. TEXT formatting does not work after inline editing. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-02 08:58:05 -04:00
Madhura Jayaratne
614912d89f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-02 12:10:01 +05:30
Kristjan Räts
464ebf695e Translated using Weblate (Estonian) 
Currently translated at 100.0% (3050 of 3050 strings)

[CI skip]
 2015-04-02 08:03:50 +02:00
Kristjan Räts
deaeab2d10 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-04-02 08:02:12 +02:00
Madhura Jayaratne
1a2fee8fbb Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:06:48 +05:30
Madhura Jayaratne
57e21caab1 bug #4828 JavaScript is loaded in wrong order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-02 11:01:23 +05:30
Marc Delisle
72d71c9da3 Merge branch 'QA_4_4' 2015-04-01 12:28:46 -04:00
Marc Delisle
d37374503d Merge commit '3a6dac8' 2015-04-01 12:28:39 -04:00
Weblate
850788d2b1 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-01 18:28:24 +02:00
Martin Lacina
a9283ab8e2 Translated using Weblate (Slovak) 
Currently translated at 83.4% (2533 of 3035 strings)

[CI skip]
 2015-04-01 18:28:22 +02:00
Marc Delisle
a26d4892e5 4.4.0 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-01 12:28:07 -04:00
Marc Delisle
71357f5de0 Translated using Weblate (French) 
Currently translated at 100.0% (3050 of 3050 strings)

[CI skip]
 2015-04-01 17:21:10 +02:00
Weblate
65fb3bf023 Merge remote-tracking branch 'origin/master' 2015-04-01 17:19:23 +02:00
Martin Lacina
32e5e523cc Translated using Weblate (Slovak) 
Currently translated at 83.3% (2541 of 3050 strings)

[CI skip]
 2015-04-01 17:19:21 +02:00
Marc Delisle
2e381cb248 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-01 11:19:11 -04:00
Weblate
da5f099ee5 Merge remote-tracking branch 'origin/master' 2015-04-01 14:11:57 +02:00
Michal Čihař
ba7b55da6a Translated using Weblate (Czech) 
Currently translated at 92.1% (2811 of 3050 strings)

[CI skip]
 2015-04-01 14:11:55 +02:00
Marc Delisle
ddeb39bcf8 Merge branch 'QA_4_4' 2015-04-01 08:10:55 -04:00