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

98807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
4a7d799a99 Merge commit '9f1f0e6' 2015-03-16 08:02:48 -04:00
Marc Delisle
d313e4a973 Merge commit '0b8e328' 2015-03-16 08:02:37 -04:00
Marc Delisle
9a400be32d Merge commit '18bccea' 2015-03-16 08:02:03 -04:00
Weblate
3d31796d30 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-16 13:01:19 +01:00
Xavier Navarro
14ef13024e Translated using Weblate (Catalan) 
Currently translated at 95.9% (2908 of 3032 strings)

[CI skip]
 2015-03-16 13:01:16 +01:00
Marc Delisle
31472e0cf0 Merge branch 'QA_4_3' into QA_4_4 2015-03-16 07:59:52 -04:00
Marc Delisle
12e8654df0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-16 07:59:26 -04:00
Marc Delisle
d5ae95d7ff Merge pull request #1578 from devenbansod/QA_4_3 
Fixes bug #4803
 2015-03-16 07:58:21 -04:00
Weblate
ceb94674f6 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-16 04:05:46 +01:00
Giovanni Sora
31cbe20756 Translated using Weblate (Interlingua) 
Currently translated at 68.8% (2087 of 3032 strings)

[CI skip]
 2015-03-16 04:05:42 +01:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Hauke Henningsen
b350af3c7f
Strip trailing spaces 
Signed-off-by: Hauke Henningsen <sqrt@entless.org>
 2015-03-16 03:29:49 +01:00
Hauke Henningsen
477bb0dc0c
Add option for exporting pretty-printed JSON 
This adds a single option to the JSON export plugin,
which, if available (PHP >= 5.4.0) corresponds to passing
`JSON_PRETTY_PRINT` to `json_encode`.

Signed-off-by: Hauke Henningsen <sqrt@entless.org>
 2015-03-16 03:22:56 +01:00
Hauke Henningsen
cf15d76413 Translated using Weblate (German) 
Currently translated at 100.0% (3036 of 3036 strings)

[CI skip]
 2015-03-16 02:12:07 +01:00
Hauke Henningsen
0b8e328f9d Translated using Weblate (German) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-16 02:11:42 +01:00
Deven Bansod
18bccea291 Fixes bug #4803 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-16 05:09:26 +05:30
Marc Delisle
728599e890 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-15 06:55:18 -04:00
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master 
Fix Feature#1609- Lock page navigation when entering data.
 2015-03-15 06:52:28 -04:00
Atul Pratap Singh
40a391ecec Merge branch 'QA_4_4' 2015-03-15 15:36:25 +05:30
Raimund Meyer
98231225e2 Fix bug#4799 Position of sticky columns wrong when screen width too small 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-15 15:25:12 +05:30
Atul Pratap Singh
dc29142610 Related to bug#4725 and rfe#1426: maintain navigation state with just required info stored in sessionstorage 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-15 14:27:47 +05:30
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data. 
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-14 22:07:44 +05:30
Marc Delisle
030a1d12aa 4.3.12 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-14 07:18:25 -04:00
Marc Delisle
4b2adb2935 Merge branch 'QA_4_4' 2015-03-14 07:16:30 -04:00
Marc Delisle
81a6cec523 4.3.12 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-14 07:15:02 -04:00
Marc Delisle
4f6fa95308 Merge branch 'QA_4_3' into QA_4_4 2015-03-14 07:14:00 -04:00
Marc Delisle
71530b3089 4.3.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-14 07:13:00 -04:00
Weblate
63632e0971 Merge remote-tracking branch 'origin/master' 2015-03-13 19:11:04 +01:00
Xavier Navarro
5b427d51f7 Translated using Weblate (Catalan) 
Currently translated at 94.5% (2870 of 3036 strings)

[CI skip]
 2015-03-13 19:11:01 +01:00
Atul Pratap Singh
7120bfb977 Merge branch 'QA_4_4' 2015-03-13 23:40:44 +05:30
Atul Pratap Singh
8bed62951d Merge commit '9f7e790' 2015-03-13 23:40:37 +05:30
Weblate
89d6e725c4 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-13 19:09:33 +01:00
Xavier Navarro
aee0e1ed29 Translated using Weblate (Catalan) 
Currently translated at 94.5% (2868 of 3032 strings)

[CI skip]
 2015-03-13 19:09:31 +01:00
Atul Pratap Singh
f6803a59e0 datepicker: remove on close inline 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 23:39:18 +05:30
Weblate
400e642b7a Merge remote-tracking branch 'origin/master' 2015-03-13 18:55:47 +01:00
Xavier Navarro
aacee5d2b5 Translated using Weblate (Catalan) 
Currently translated at 94.4% (2869 of 3036 strings)

[CI skip]
 2015-03-13 18:55:44 +01:00
Atul Pratap Singh
51428c8132 Merge branch 'QA_4_4' 2015-03-13 23:25:02 +05:30
Atul Pratap Singh
3fe1604b7f Merge commit 'c085d0d' 2015-03-13 23:24:28 +05:30
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
Weblate
9f7e790c30 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-13 18:22:16 +01:00
Xavier Navarro
0a476df095 Translated using Weblate (Catalan) 
Currently translated at 93.4% (2834 of 3032 strings)

[CI skip]
 2015-03-13 18:22:13 +01:00
Atul Pratap Singh
2d64504915 Fix bugs#4800] On selecting date, the datepicker disappears on master 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:51:56 +05:30
Weblate
f206cb35d8 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-13 18:16:46 +01:00
Xavier Navarro
f570728646 Translated using Weblate (Catalan) 
Currently translated at 93.2% (2828 of 3032 strings)

[CI skip]
 2015-03-13 18:16:43 +01:00
Atul Pratap Singh
4e8ac3c796 Merge branch 'QA_4_3' into QA_4_4 2015-03-13 22:45:23 +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
Atul Pratap Singh
c085d0d56a datepicker: correct position on clicking on icon and prevent closing on outside click 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-13 22:22:36 +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