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

98461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
0e1b596ca5 Merge commit '17d9d82' 
Conflicts:
	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 23:24:01 +05:30
Atul Pratap Singh
4081927598 Merge commit '6cccbe4' 2015-03-13 23:22:38 +05:30
Atul Pratap Singh
17d9d82c41 Remove unnecessary checkbox repositioning 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:

	js/makegrid.js

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:44:37 +05:30
Marc Delisle
7714e86e74 Merge pull request #1563 from madhuracj/rfe1561 
Per server iv
 2015-03-13 12:21:19 -04:00
Marc Delisle
d47edaf6dc Merge commit '638de4f' 2015-03-13 08:55:41 -04:00
Marc Delisle
ba7a38f5c4 Merge commit '2f7d6cb' 2015-03-13 08:55:17 -04:00
Marc Delisle
60771f6fab Merge commit '1178816' 2015-03-13 08:55:06 -04:00
Marc Delisle
fba9a7268d Merge commit '5b1eb07' 2015-03-13 08:54:47 -04:00
Weblate
6cccbe425f Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-13 13:54:34 +01:00
Burak Yavuz
bc248d1400 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-13 13:54:32 +01:00
Balázs Úr
1d8790ad2f Translated using Weblate (Hungarian) 
Currently translated at 99.9% (3031 of 3032 strings)

[CI skip]
 2015-03-13 13:54:29 +01:00
Xavier Navarro
b3d8205ecd Translated using Weblate (Catalan) 
Currently translated at 92.6% (2808 of 3032 strings)

[CI skip]
 2015-03-13 13:54:28 +01:00
Marc Delisle
638de4f1a1 Merge branch 'QA_4_3' into QA_4_4 2015-03-13 08:52:54 -04:00
Marc Delisle
edb1fc8ec0 Merge commit '2f7d6cb' into QA_4_4 2015-03-13 08:52:31 -04:00
Marc Delisle
7279a9bc02 Merge commit '5b1eb07' into QA_4_4 2015-03-13 08:52:21 -04:00
Marc Delisle
9712206433 Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2015-03-13 08:51:34 -04:00
Marc Delisle
2f7d6cb323 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-13 08:50:44 -04:00
Marc Delisle
3f62197019 Bug #4786: also fix the original theme 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-13 08:49:36 -04:00
Andrea Vallorani
7934919b9e Bug #4786 SELECT width on relations page 
Signed-off-by: Andrea Vallorani andrea.vallorani@gmail.com
 2015-03-13 08:47:52 -04:00
Atul Pratap Singh
5b1eb0752f Remove unnecessary checkbox repositioning 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 17:52:34 +05:30
Weblate
ca6a41f865 Merge remote-tracking branch 'origin/master' 2015-03-13 13:13:13 +01:00
Xavier Navarro
07e9d331a1 Translated using Weblate (Catalan) 
Currently translated at 92.5% (2810 of 3036 strings)

[CI skip]
 2015-03-13 13:13:11 +01:00
Atul Pratap Singh
5ad307f770 Fix bugs#4800] On selecting date, the datepicker disappears on master 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 17:42:40 +05:30
Weblate
9041ec8dd7 Merge remote-tracking branch 'origin/master' 2015-03-12 19:57:07 +01:00
Xavier Navarro
5d0b24246c Translated using Weblate (Catalan) 
Currently translated at 90.1% (2736 of 3036 strings)

[CI skip]
 2015-03-12 19:57:04 +01:00
Atul Pratap Singh
1c82e5eaf5 Merge branch 'QA_4_3' 2015-03-13 00:26:14 +05:30
Atul Pratap Singh
45fbe0bc2a Fix bug#4797 Inline edit of DATETIME fields, can't change month nor time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-12 23:52:18 +05:30
Marc Delisle
d295244b7b Merge pull request #1565 from udan11/coding_style 
Fix minor coding style issues.
 2015-03-12 08:58:24 -04:00
Weblate
11cf94bd59 Merge remote-tracking branch 'origin/master' 2015-03-12 12:53:13 +01:00
Burak Yavuz
48a1e48ae1 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3036 of 3036 strings)

[CI skip]
 2015-03-12 12:53:11 +01:00
Xavier Navarro
8e05858875 Translated using Weblate (Catalan) 
Currently translated at 88.1% (2675 of 3036 strings)

[CI skip]
 2015-03-12 12:53:08 +01:00
Madhura Jayaratne
5f2d4ff353 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-12 17:22:32 +05:30
Madhura Jayaratne
bedc7d1f5b Remove unused chart colors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-12 17:21:03 +05:30
Weblate
434122f3fb Merge remote-tracking branch 'origin/master' 2015-03-12 06:48:58 +01:00
Balázs Úr
e70d165406 Translated using Weblate (Hungarian) 
Currently translated at 99.9% (3035 of 3036 strings)

[CI skip]
 2015-03-12 06:48:55 +01:00
Xavier Navarro
4a3dd2d687 Translated using Weblate (Catalan) 
Currently translated at 86.6% (2630 of 3036 strings)

[CI skip]
 2015-03-12 06:48:53 +01:00
Atul Pratap Singh
49da35b5fc Merge branch 'QA_4_3' 2015-03-12 11:18:06 +05:30
Atul Pratap Singh
6493129130 Merge pull request #1570 from udan11/QA_4_3 
RFE #1617. Click back on the button closes the card.
 2015-03-12 11:08:51 +05:30
Dan Ungureanu
ac665a8945 RFE #1617. Click back on the button closes the card. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-12 00:27:50 +02:00
Weblate
ed5442954d Merge remote-tracking branch 'origin/master' 2015-03-11 21:02:13 +01:00
k725
5101868e1f Translated using Weblate (Japanese) 
Currently translated at 72.6% (2205 of 3036 strings)

[CI skip]
 2015-03-11 21:02:10 +01:00
Xavier Navarro
91e1fca4a9 Translated using Weblate (Catalan) 
Currently translated at 85.3% (2591 of 3036 strings)

[CI skip]
 2015-03-11 21:02:08 +01:00
Marc Delisle
3ad82c865e Merge branch 'QA_4_4' 2015-03-11 16:01:08 -04:00
Marc Delisle
df9881d8de Merge commit '8e24ea5' 2015-03-11 16:00:55 -04:00
Weblate
11788163ff Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-11 21:00:46 +01:00
Kristian Løining
97a682b3c0 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 58.6% (1777 of 3032 strings)

[CI skip]
 2015-03-11 21:00:44 +01:00
k725
db1ddcc4e4 Translated using Weblate (Japanese) 
Currently translated at 72.7% (2205 of 3032 strings)

[CI skip]
 2015-03-11 21:00:42 +01:00
Xavier Navarro
a43327ab58 Translated using Weblate (Catalan) 
Currently translated at 85.4% (2590 of 3032 strings)

[CI skip]
 2015-03-11 21:00:40 +01:00
Marc Delisle
44c28bd5a2 Merge branch 'QA_4_3' into QA_4_4 2015-03-11 15:59:28 -04:00
Marc Delisle
1a028c05f7 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-11 15:58:57 -04:00