Commit Graph

80511 Commits

Author SHA1 Message Date
Marc Delisle
da0609d1ae Fix merge conflicts 2012-12-12 15:25:20 -05:00
Marc Delisle
7a90141ec3 Merge branch 'QA_3_5' 2012-12-12 15:24:39 -05:00
Marc Delisle
88b0f56fd1 bug #3544366 [events] Event comments not saved 2012-12-12 15:23:14 -05:00
Marc Delisle
72eaf6d338 Fix merge conflicts 2012-12-12 15:04:55 -05:00
Marc Delisle
018974d168 Merge branch 'QA_3_5' 2012-12-12 14:58:20 -05:00
Marc Delisle
584c528203 bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid SQL 2012-12-12 13:03:55 -05:00
Michal Čihař
da53f393ab Merge pull request #117 from DronRathore/master
MySql version should also be brought to notice.
2012-12-12 00:01:23 -08:00
Dron Rathore
28b683b2e9 mysql version should also be included in "require"
mysql versions are also varying in functionality, so we should tell that too.
2012-12-12 13:19:18 +05:30
Marc Delisle
7c388f56b2 Support ShowTooltip config directive having a value of false 2012-12-11 08:19:14 -05:00
Marc Delisle
b0a6275f87 Remove redundant PMA_ prefix 2012-12-10 14:25:54 -05:00
Marc Delisle
7ff92fd6a7 Bug #3591442 Fatal error when dropping table 2012-12-10 13:01:54 -05:00
Weblate
181db4a725 Merge remote-tracking branch 'origin/master' 2012-12-10 17:34:41 +01:00
Emil Hemdal
f08295b3bc Translated using Weblate (Swedish)
Currently translated at 99.5% (2597 of 2610)
2012-12-10 17:34:37 +01:00
Madhura Jayaratne
485899d85f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-12-10 22:00:00 +05:30
Madhura Jayaratne
ca98097f3c Float the menu bar of the designer 2012-12-10 21:48:39 +05:30
Rouslan Placella
d55c193d9c Ensure $response contains a valid object 2012-12-10 07:26:43 -05:00
Michal Čihař
99d1c6150b Merge remote-tracking branch 'origin/QA_3_5' 2012-12-10 09:00:54 +01:00
Jere Vainionpää
7d26b2074f Translated using Weblate (Finnish)
Currently translated at 74.2% (1902 of 2562)
2012-12-10 08:59:55 +01:00
Michal Čihař
98ae495dcb Translated using Weblate (Czech)
Currently translated at 100.0% (2610 of 2610)
2012-12-10 08:53:11 +01:00
Panagiotis Papazoglou
e307f34a3a Translated using Weblate (Greek)
Currently translated at 100.0% (2610 of 2610)
2012-12-09 22:43:57 +01:00
Madhura Jayaratne
5d10c689b9 Allow deleting relations in fullscreen mode 2012-12-10 00:21:08 +05:30
Madhura Jayaratne
ab7b333269 Fix some css glitches 2012-12-09 23:45:33 +05:30
Matías Bellone
a3fe5862ad Translated using Weblate (Spanish)
Currently translated at 100.0% (2610 of 2610)
2012-12-09 15:40:05 +01:00
Burak Yavuz
1265979feb Translated using Weblate (Turkish)
Currently translated at 100.0% (2610 of 2610)
2012-12-09 15:35:03 +01:00
Rouslan Placella
0a087330fa The data dictionary is a print view page 2012-12-09 13:47:52 +00:00
Marc Delisle
9fd9968e02 Translated using Weblate (French)
Currently translated at 100.0% (2610 of 2610)
2012-12-09 13:19:58 +01:00
Marc Delisle
22f1a27b53 Update po files 2012-12-09 07:13:10 -05:00
Marc Delisle
9f6bd6aba5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-12-09 07:10:58 -05:00
Marc Delisle
e41e0f4a64 - use the previous idea of clicking anywhere on the bar
- advertise this idea with the icon's link
2012-12-09 07:08:48 -05:00
Marc Delisle
f6396c07e9 Translated using Weblate (French)
Currently translated at 100.0% (2610 of 2610)
2012-12-09 12:40:21 +01:00
Marc Delisle
4dcbc453a4 Update po files 2012-12-09 06:25:16 -05:00
Marc Delisle
01704e2696 Merge pull request #116 from madhuracj/fullscreenModeForDesigner
Fullscreen mode for designer
2012-12-09 03:20:39 -08:00
Marc Delisle
b4f9689393 We can just get an instance of PMA_Response 2012-12-09 05:37:30 -05:00
Madhura Jayaratne
8d3104e99f Fix setting display column 2012-12-09 13:50:40 +05:30
Madhura Jayaratne
941bb5798e Fix some z-index values 2012-12-09 12:57:06 +05:30
Madhura Jayaratne
41d20eee1a Correctly locate the points 2012-12-09 12:18:41 +05:30
Madhura Jayaratne
9ef4d3219d Icon was too tall to fit into the top bar 2012-12-09 10:13:14 +05:30
Madhura Jayaratne
4ec6709354 Set the class attribute initially 2012-12-09 10:04:02 +05:30
Madhura Jayaratne
4971be2286 Position left menu correctly. Fix z-indexes so they do not go on top of navigation panel or top menu 2012-12-09 10:00:38 +05:30
Madhura Jayaratne
7b8313c22a ChangeLog entry for the fullscreen mode 2012-12-09 07:19:49 +05:30
Madhura Jayaratne
a0800da4c1 Fullscreen mode for the designer 2012-12-09 07:08:08 +05:30
Weblate
f932fcfa49 Merge remote-tracking branch 'origin/master' 2012-12-08 15:37:33 +01:00
Jere Vainionpää
7638dbea3b Translated using Weblate (Finnish)
Currently translated at 70.1% (1827 of 2607)
2012-12-08 15:37:29 +01:00
Marc Delisle
048c2d87ab Partial fix for bug #3593138. Still need to find how to go back to
tbl_structure.php after the ALTER TABLE has been executed.
2012-12-08 09:34:28 -05:00
Ilkka Kiviharju
5b409b5827 Translated using Weblate (Finnish)
Currently translated at 74.2% (1901 of 2562)
2012-12-08 10:55:25 +01:00
Madhura Jayaratne
11347bcb98 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-12-08 08:38:18 +05:30
Madhura Jayaratne
ae6f017824 Make the designer compatible with frames less v4 2012-12-08 08:36:16 +05:30
Weblate
8b45ce4fad Merge remote-tracking branch 'origin/master' 2012-12-07 21:26:31 +01:00
Ilkka Kiviharju
d700f97a31 Translated using Weblate (Finnish)
Currently translated at 70.0% (1826 of 2607)
2012-12-07 21:26:28 +01:00
Marc Delisle
9edecf0478 Merge pull request #115 from roccivic/cache-version-check
Cache the version information obtained from phpmyadmin.net
2012-12-07 12:26:16 -08:00