Commit Graph

57282 Commits

Author SHA1 Message Date
Rouslan Placella
2f889c0bba Removed sprite regeneration from create-release.sh as it may interfere with releases for stable branches 2011-09-30 21:32:47 +01:00
Rouslan Placella
3db0cb1a18 Deleted old sprites 2011-09-30 19:52:25 +01:00
Rouslan Placella
ef2e103adb Merge branch 'sprites' 2011-09-30 19:51:05 +01:00
Rouslan Placella
b8d454f851 Fixed unit tests 2011-09-30 16:44:06 +01:00
Madhura Jayaratne
20f6ee84d6 Syntax error using str_replace() 2011-09-29 23:14:56 +05:30
Marc Delisle
96bf96d422 Merge branch 'QA_3_4' 2011-09-29 12:48:03 -04:00
Hans Fr. Nordhaug
6c980106b7 patch #3314626 [display] CharTextareaRows is not respected 2011-09-29 12:47:48 -04:00
Madhura Jayaratne
abe93510a2 Merge branch 'QA_3_4' 2011-09-29 21:17:26 +05:30
Madhura Jayaratne
55d1360b7e To avoid a notice on undefined variable 2011-09-29 21:14:11 +05:30
Madhura Jayaratne
e96b059dfa Merge branch 'QA_3_4' 2011-09-29 19:45:48 +05:30
Madhura Jayaratne
a9f2c38942 bug #3414744 [core] External link fails in 3.4.5 2011-09-29 19:43:28 +05:30
Marc Delisle
963f478fdd Fix merge conflicts 2011-09-29 07:12:57 -04:00
Marc Delisle
86138fa914 Merge branch 'QA_3_4' 2011-09-29 07:06:48 -04:00
Marc Delisle
acbbd8fc56 bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 2011-09-29 06:41:06 -04:00
Marc Delisle
86722781eb A table has been dropped from outside phpMyAdmin 2011-09-29 06:19:03 -04:00
Marc Delisle
789ed0d3d1 A table has been dropped from outside phpMyAdmin 2011-09-29 06:08:30 -04:00
Madhura Jayaratne
0ad7567d3f Merge branch 'QA_3_4' 2011-09-28 18:20:07 +05:30
Madhura Jayaratne
37dff12901 bug #3390832 [display] Delete records from last page breaks search 2011-09-28 18:17:39 +05:30
Madhura Jayaratne
192b534b95 bug #3356456 [interface] Interface problems for queries having LIMIT clauses 2011-09-28 15:30:13 +05:30
Madhura Jayaratne
09d48a6554 Coding style improvements 2011-09-28 13:32:14 +05:30
Madhura Jayaratne
0ad1a0f831 Fix doc blocks and multiline if statements 2011-09-27 21:49:41 +05:30
Madhura Jayaratne
1101e13a6a coding style improvements and fixing some doc blocks 2011-09-27 21:19:57 +05:30
Madhura Jayaratne
2aec106b90 Merge branch 'QA_3_4'
Conflicts:
	tbl_relation.php
2011-09-27 21:11:10 +05:30
Madhura Jayaratne
2e101cc733 bug #3412862 [relation] Relations/constraints are dropped/created on every change 2011-09-27 21:06:21 +05:30
Rouslan Placella
2b5a70cd48 More readable generation of CSS code for sprites 2011-09-27 16:34:11 +01:00
Rouslan Placella
2a24125ecc Prevent the CSS background attribute from being overridden for the 'icon' class 2011-09-27 16:29:18 +01:00
Rouslan Placella
5d5f4ac908 JS syntax error 2011-09-27 16:11:02 +01:00
Michal Čihař
66b879c458 Fix format string 2011-09-27 09:42:35 +02:00
Michal Čihař
05d0c9df14 Update po files 2011-09-27 09:14:58 +02:00
Michal Čihař
f5fa5f8b2e Merge remote-tracking branch 'origin/QA_3_4' 2011-09-27 09:05:01 +02:00
Michal Čihař
f29ba65b70 Update translations from master 2011-09-27 09:02:36 +02:00
Michal Čihař
5c4730df9e Fix format string 2011-09-27 08:59:15 +02:00
Michal Čihař
2360d19722 Merge remote-tracking branch 'pootle/master'
Conflicts:
	po/ar.po
	po/da.po
	po/el.po
	po/en_GB.po
	po/fr.po
	po/it.po
	po/ja.po
	po/ko.po
	po/ml.po
	po/ru.po
	po/sl.po
2011-09-27 08:55:55 +02:00
sadik.khalid
1759807413 Translation update done using Pootle. 2011-09-27 08:43:00 +02:00
Rouslan Placella
ec54aacbd1 Fix some closure-compiler errors 2011-09-26 22:02:37 +01:00
Rouslan Placella
19e69ed770 Changed the way the attributes are fetched from the object returned by PMA_getImage() in JS
Stops the 'closure-compiler' from erroring out
2011-09-26 21:10:11 +01:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Rouslan Placella
b1c60c7d19 Regenerated the sprites 2011-09-26 20:47:22 +01:00
Rouslan Placella
1431d02c8f Made PMA aware of the presence of sprites + added a script for generating sprites from icons 2011-09-26 20:46:28 +01:00
Marc Delisle
4ba58c71d5 Fix merge conflicts 2011-09-26 12:31:18 -04:00
Marc Delisle
22aaa6d9c5 Document that a public bookmark having the same name as the table is not executed 2011-09-26 12:25:31 -04:00
sadik.khalid
821f18fdd1 Translation update done using Pootle. 2011-09-26 16:12:07 +02:00
sadik.khalid
bf250aa15f Translation update done using Pootle. 2011-09-26 16:10:52 +02:00
sadik.khalid
2c9e3d9d84 Translation update done using Pootle. 2011-09-26 16:10:04 +02:00
sadik.khalid
4f0e428c48 Translation update done using Pootle. 2011-09-26 16:09:20 +02:00
sadik.khalid
53765cb655 Translation update done using Pootle. 2011-09-26 16:08:48 +02:00
sadik.khalid
573db2dbf9 Translation update done using Pootle. 2011-09-26 16:07:20 +02:00
sadik.khalid
e9e0649f05 Translation update done using Pootle. 2011-09-26 16:06:59 +02:00
sadik.khalid
f622f477b0 Translation update done using Pootle. 2011-09-26 16:06:44 +02:00
sadik.khalid
d42132171a Translation update done using Pootle. 2011-09-26 16:06:28 +02:00