Commit Graph

75226 Commits

Author SHA1 Message Date
Michal Čihař
d5fba335e1 Merge pull request #47 from nijel/master
Types class preview
2012-04-26 00:53:55 -07:00
Michal Čihař
0470f942ec Merge remote-tracking branch 'origin/QA_3_5' 2012-04-26 09:52:24 +02:00
Burak Yavuz
941cf69770 Translated using Weblate. 2012-04-26 09:51:51 +02:00
Marc Delisle
edbad40662 Translated using Weblate. 2012-04-26 02:22:46 +02:00
Michal Čihař
7e5dbcc195 Merge remote-tracking branch 'origin/master' 2012-04-25 23:02:11 +02:00
Piotr Przybylski
285b9d0367 Common strings for descriptions of DATE, TIME, DATETIME and VARCHAR2 2012-04-25 23:01:49 +02:00
Michal Čihař
9b51a6f6bf Merge remote-tracking branch 'origin/master' 2012-04-25 22:47:14 +02:00
Piotr Przybylski
e8a58dddf0 Better descriptions for Drizzle column types 2012-04-25 22:46:16 +02:00
Piotr Przybylski
69b3ccf203 Fixed descriptions of geometry types - these are column types, not OpenGIS objects 2012-04-25 22:46:16 +02:00
Piotr Przybylski
bb1d783466 More concise descriptions for MySQL column types 2012-04-25 22:46:16 +02:00
Michal Čihař
b46ac49797 Merge remote-tracking branch 'origin/master' 2012-04-25 22:07:05 +02:00
Burak Yavuz
a6d3537a7e Translated using Weblate. 2012-04-25 22:07:02 +02:00
Michal Čihař
470a3ea710 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-04-25 22:06:48 +02:00
Burak Yavuz
ca6e5fa4e4 Translated using Weblate. 2012-04-25 22:06:44 +02:00
Lucas David
fb53b7873d Translated using Weblate. 2012-04-25 22:06:43 +02:00
Rouslan Placella
ebb5a21045 Merge branch 'QA_3_5' 2012-04-25 21:06:18 +01:00
Rouslan Placella
403fd46818 Fixed bug #3521416 - JS error when editing index 2012-04-25 21:05:41 +01:00
Michal Čihař
0292b4bfde Merge remote-tracking branch 'origin/master' 2012-04-25 21:27:41 +02:00
Burak Yavuz
1d4e1ce1cf Translated using Weblate. 2012-04-25 21:27:38 +02:00
Rouslan Placella
797b01a1dd Regenerated icon sprites 2012-04-25 20:24:15 +01:00
Rouslan Placella
1fb54d8e97 Added a new 'move columns' icon 2012-04-25 20:23:27 +01:00
Michal Čihař
e80387f88a Merge remote-tracking branch 'origin/master' 2012-04-25 20:59:18 +02:00
Burak Yavuz
060ec39bb4 Translated using Weblate. 2012-04-25 20:59:16 +02:00
Rouslan Placella
349209290a Fixed "more" dropdown after adding or moving a column in tbl_structure 2012-04-25 19:59:01 +01:00
Michal Čihař
d507c1d749 Merge remote-tracking branch 'origin/master' 2012-04-25 20:25:37 +02:00
Madhura Jayaratne
da0c3bbd13 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/Table.class.php
2012-04-25 23:53:12 +05:30
Michal Čihař
592c0d6551 Merge remote-tracking branch 'origin/master' 2012-04-25 20:18:24 +02:00
Burak Yavuz
dfae9041ca Translated using Weblate. 2012-04-25 20:18:21 +02:00
Lucas David
923707ec7d Translated using Weblate. 2012-04-25 20:18:21 +02:00
Rouslan Placella
ad57f68b97 Skip more broken unit tests 2012-04-25 19:17:14 +01:00
Madhura Jayaratne
1064ea932d Coding style fixes 2012-04-25 23:46:57 +05:30
Matías Bellone
b113238eac Translated using Weblate. 2012-04-25 20:09:30 +02:00
Madhura Jayaratne
4ff76ff31c Coding style improvements (Inline control structures are discouraged) 2012-04-25 23:39:04 +05:30
Madhura Jayaratne
d6e05d74b5 Various coding style fixes 2012-04-25 23:12:09 +05:30
Madhura Jayaratne
50e6f3b387 Coding style improvements (ControlSignature) 2012-04-25 23:02:37 +05:30
Madhura Jayaratne
a817542fda Coding style improvements (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-25 22:27:32 +05:30
Madhura Jayaratne
8efb862408 More coding style fixes 2012-04-25 22:06:29 +05:30
Marc Delisle
53221806bd Refresh .po files 2012-04-25 12:35:17 -04:00
Madhura Jayaratne
2575cccf2d Coding style improvements (Last parameter comment requires a blank newline after it) 2012-04-25 22:04:14 +05:30
Marc Delisle
503e45aba5 Fix merge conflicts 2012-04-25 12:29:55 -04:00
Michal Čihař
d24ae82525 gd_info is present since PHP 4.3, so no need to provide workarouds when it does not exist 2012-04-25 15:55:47 +02:00
Michal Čihař
58c1b658e1 Simplify code 2012-04-25 15:25:59 +02:00
Michal Čihař
76d17be624 Add testcase 2012-04-25 15:24:43 +02:00
Michal Čihař
bf9aed3b61 Docs 2012-04-25 15:21:31 +02:00
Michal Čihař
f4a0549beb Drop config option UnaryOperators 2012-04-25 15:17:37 +02:00
Michal Čihař
c1940d2b4f Use isUnaryOperator method 2012-04-25 15:17:17 +02:00
Rouslan Placella
2fd0effc43 Skip PMA_RTN_getDataFromRequest test until we fix it 2012-04-25 14:14:51 +01:00
Michal Čihař
a2bf814f57 Add class for handling types 2012-04-25 15:14:19 +02:00
Michal Čihař
b984cb7dd3 Update po files 2012-04-25 15:00:08 +02:00
Michal Čihař
96025ccbc5 Merge remote-tracking branch 'origin/master' 2012-04-25 14:48:48 +02:00