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

91446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashutosh Dhundhara
ca562232dd Bug Fix: #4368 Recent/Favorite tables persist even if they don't exist. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-16 17:18:58 +05:30
Michal Čihař
1d2460a058 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	po/nb.po
 2014-04-16 12:59:37 +02:00
Michal Čihař
8495ac3b50 Add Colognian translaation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-16 12:58:51 +02:00
Michal Čihař
5738c2ddc8 Update po files 2014-04-16 12:57:32 +02:00
Michal Čihař
fb7c960d1d Merge remote-tracking branch 'origin/QA_4_1' 2014-04-16 12:56:57 +02:00
ketil vestby
1878bffd7c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 61.4% (1698 of 2765)
 2014-04-16 12:56:37 +02:00
Purodha Blissenbach
b0739e0e6e Translated using Weblate (German) 
Currently translated at 93.5% (2588 of 2765)
 2014-04-16 12:56:33 +02:00
Claus Svalekjaer
5eacbab394 Translated using Weblate (Danish) 
Currently translated at 95.9% (2653 of 2765)
 2014-04-16 12:56:29 +02:00
ketil vestby
237e8a5f73 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 69.6% (1915 of 2750)
 2014-04-16 12:56:19 +02:00
Claus Svalekjaer
f5ba8c3941 Translated using Weblate (Danish) 
Currently translated at 99.8% (2746 of 2750)
 2014-04-16 12:56:14 +02:00
Marc Delisle
7f91560cb8 Merge commit '13fb926' 2014-04-15 12:37:16 -04:00
Marc Delisle
a81ff24341 Merge commit '0ece94e' 2014-04-15 12:36:58 -04:00
Marc Delisle
1186e6e28d Merge commit '13dce54' 2014-04-15 12:36:44 -04:00
Marc Delisle
4b34ec6e52 Merge commit '29fb3c8' 2014-04-15 12:35:50 -04:00
Marc Delisle
967ac93a71 Merge commit 'c91fec4' 2014-04-15 12:35:35 -04:00
Marc Delisle
13fb926828 Merge branch 'QA_4_1' of https://github.com/phpmyadmin/phpmyadmin into QA_4_1 2014-04-15 12:33:10 -04:00
Marc Delisle
0ece94e5f3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-15 12:32:43 -04:00
Weblate
13dce544db Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-15 18:32:02 +02:00
Burak Yavuz
af11e122b4 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2750 of 2750)
 2014-04-15 18:32:00 +02:00
Marc Delisle
8ca0879500 Merge pull request #1140 from ashutoshdhundhara/bugfix_4365 
Bug Fix: #4365 Creating bookmark with multiple queries not working.
 2014-04-15 12:31:53 -04:00
Ashutosh Dhundhara
29fb3c8931 Bug Fix: #4365 Creating bookmark with multiple queries not working. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-15 19:53:05 +05:30
Andriy Bandura
c91fec42da Translated using Weblate (Ukrainian) 
Currently translated at 95.1% (2617 of 2750)
 2014-04-15 15:44:12 +02:00
Weblate
b77cc7f1ce Merge remote-tracking branch 'origin/master' 2014-04-14 19:05:06 +02:00
Andriy Bandura
af46246eb5 Translated using Weblate (Ukrainian) 
Currently translated at 89.2% (2469 of 2765)
 2014-04-14 19:05:04 +02:00
Burak Yavuz
a0890828fa Translated using Weblate (Turkish) 
Currently translated at 100.0% (2765 of 2765)
 2014-04-14 19:05:01 +02:00
Marc Delisle
a182cca004 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-14 12:26:32 -04:00
Павло
5a15fa79ac Translated using Weblate (Ukrainian) 
Currently translated at 94.5% (2601 of 2750)
 2014-04-13 15:10:00 +02:00
Weblate
003a31e12c Merge remote-tracking branch 'origin/master' 2014-04-13 12:36:31 +02:00
Burak Yavuz
67e6a724d7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2765 of 2765)
 2014-04-13 12:36:28 +02:00
Marc Delisle
87eca2dfae 4.1.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-13 06:36:03 -04:00
Marc Delisle
a13855a288 Merge commit 'd1a067c' 2014-04-13 06:34:53 -04:00
Weblate
af7f608f00 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-13 12:34:27 +02:00
Burak Yavuz
da0ef765e9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2750 of 2750)
 2014-04-13 12:34:25 +02:00
Yungu Kim
dea9e5e195 Translated using Weblate (Korean) 
Currently translated at 79.0% (2174 of 2750)
 2014-04-13 12:34:22 +02:00
Marc Delisle
d1a067c4d9 4.1.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-13 06:34:10 -04:00
Weblate
9950c800b4 Merge remote-tracking branch 'origin/master' 2014-04-12 16:49:52 +02:00
Yungu Kim
d9b25468e6 Translated using Weblate (Korean) 
Currently translated at 75.4% (2085 of 2765)
 2014-04-12 16:49:49 +02:00
Marc Delisle
865d76a602 Merge pull request #1138 from ashutoshdhundhara/bugfix_4362 
Bug Fix: #4362 Adding index to column by button in structure view shows wrong dialog.
 2014-04-12 10:49:46 -04:00
Ashutosh Dhundhara
57f8e18e96 Bug Fix: #4362 Adding index to column by button in structure view shows wrong dialog. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-12 18:34:47 +05:30
Marc Delisle
cf924e57f5 Merge commit '64e9287' 2014-04-12 07:28:39 -04:00
Marc Delisle
609c0acaf3 Merge commit 'b82fe09' 2014-04-12 07:28:17 -04:00
Marc Delisle
be7f34d546 Merge commit '5d9bcd3' 2014-04-12 07:28:08 -04:00
Marc Delisle
d6592b5eb2 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:27:53 -04:00
Marc Delisle
8ef8fbfbc8 Merge commit '2df8cdb' 2014-04-12 07:18:39 -04:00
Marc Delisle
64e9287df5 Remove extra comma 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:16:02 -04:00
Marc Delisle
b82fe0977e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:10:26 -04:00
Marc Delisle
5d9bcd360c Merge pull request #1136 from ashutoshdhundhara/bugfix_4357 
Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field.
 2014-04-12 07:08:26 -04:00
Michal Čihař
e82c1b2e09 Add CSPAllow to script-src as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-12 11:43:06 +02:00
Ashutosh Dhundhara
6e241b8411 Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed TODO tag from comment in rte.js

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-12 10:40:04 +05:30
Weblate
2df8cdb207 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-11 19:18:44 +02:00