gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,943 Commits 12 Branches 481 Tags 2.4 GiB
216878b987
Commit Graph

77943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
216878b987 Merge branch 'QA_3_5' 2012-08-03 12:57:12 -04:00
Marc Delisle
45de0c0d98 Fix merge conflicts 2012-08-03 12:56:38 -04:00
Madhura Jayaratne
c91da33246 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-08-03 22:05:32 +05:30
Madhura Jayaratne
965d525cf8 Coding style fixes 2012-08-03 22:02:49 +05:30
Madhura Jayaratne
4bc2c7e0cb Checking whether $criteriaValues is empty should be done before calling _getEnumWhereClause() 2012-08-03 22:01:26 +05:30
Rouslan Placella
4147285d81 [pmahomme] Drop the background color from self link - it looks ugly on some monitors 2012-08-03 12:07:05 +02:00
Rouslan Placella
5750ab31db Don't double-wrap error messages for change password form 2012-08-03 10:07:47 +02:00
Rouslan Placella
b0a9418591 Use PMA_Message for all connection errors 2012-08-03 10:05:48 +02:00
Michal Čihař
bb85f14440 Merge remote-tracking branch 'weblate/master' 2012-08-03 09:38:41 +02:00
Ashiyane Digital Security Team
0c00bc9d77 Translated using Weblate. 2012-08-03 07:59:30 +02:00
Michal Čihař
27d9010d21 Merge remote-tracking branch 'chanaka/master' 2012-08-03 07:59:02 +02:00
J.M
b77acffe43 Show error message when trying to change password right after changing password, see bug #3547670 2012-08-02 22:02:46 +02:00
Rouslan Placella
ef65ca306a Neater test for potentially undefined variable and some whitespace cleanup 2012-08-02 21:25:54 +02:00
Chanaka Indrajith
bb098373fd Merge remote branch 'upstream/master' 2012-08-03 00:35:41 +05:30
Chanaka Indrajith
d9d92dda46 Image link display transformed data in sql query results 2012-08-03 00:35:09 +05:30
Marc Delisle
f544ba3f6f Fix undefined index problem 2012-08-02 14:11:22 -04:00
Rouslan Placella
2428a6f4c2 Dropped pointless lazy getter (if the menu is instanciated, we'll have to get a reference to the common functions anyway) 2012-08-02 19:02:14 +02:00
Rouslan Placella
ba7a49e81c Fixed order of tabs in the top menu for empty databases 2012-08-02 18:57:24 +02:00
Rouslan Placella
248321118e Don't show the menu and footer in the changelog 2012-08-02 18:01:27 +02:00
Rouslan Placella
df3dae306a Fixed missing POST variables in multi submits (due to removal of grab_globals) 2012-08-02 17:09:23 +02:00
Weblate
45777e6311 Merge remote-tracking branch 'origin/master' 2012-08-02 12:42:11 +02:00
Rouslan Placella
ede98d1fe2 Close page tags properly 2012-08-02 12:41:42 +02:00
Weblate
9b6846d550 Merge remote-tracking branch 'origin/master' 2012-08-02 12:30:57 +02:00
Rouslan Placella
799119b23b Fixed invalid HTML code (unnecessarily escaped quotes) 2012-08-02 12:29:03 +02:00
Xavier Navarro
3962488842 Translated using Weblate. 2012-08-02 12:13:15 +02:00
Rouslan Placella
68f6226f46 Merge branch 'QA_3_5' 
Conflicts:
	libraries/mult_submits.inc.php
	po/ca.po
 2012-08-02 12:10:44 +02:00
Rouslan Placella
9699979ea9 Fixed bug #3553551 - Invalid HTML code in multi submits confirmation form 2012-08-02 12:05:20 +02:00
Xavier Navarro
d72f329301 Translated using Weblate. 2012-08-02 11:56:39 +02:00
Michal Čihař
fbe4bf7770 Merge remote-tracking branch 'chanaka/master' 2012-08-02 09:03:39 +02:00
Marc Delisle
5942db9839 Merge pull request #87 from madhuracj/SearchPageImprovements 
Table search page improvements
 2012-08-01 11:49:30 -07:00
Marc Delisle
da869f796b Merge pull request #86 from roccivic/js-insert-fix 
Fixed fatal JS error when changing insert action
 2012-08-01 11:24:03 -07:00
Chanaka Indrajith
9705f8e1cd Fix undefined function issue in Tracker class 2012-08-01 23:41:55 +05:30
Chanaka Indrajith
22c16fea5a Merge remote branch 'upstream/master' 2012-08-01 23:30:40 +05:30
Chanaka Indrajith
87bcfe6deb Links for information_schema 2012-08-01 23:29:41 +05:30
Madhura Jayaratne
d56883327b Make the two tabs look alike 2012-08-01 23:25:05 +05:30
Madhura Jayaratne
d32f413857 Activate search tab for both ordinary table search and zoom search 2012-08-01 23:09:52 +05:30
Madhura Jayaratne
d0e4e37e84 Same look and feel of the settings page 2012-08-01 22:57:27 +05:30
Madhura Jayaratne
7901d0d4e4 Simplify the code a bit 2012-08-01 22:27:43 +05:30
Madhura Jayaratne
a2fc65637f Do not hide the end tag in some other function 2012-08-01 22:26:01 +05:30
Rouslan Placella
0793e76c11 Fixed fatal JS error when changing insert action 2012-08-01 18:41:47 +02:00
Madhura Jayaratne
c2e22dd1ac Fix footer fieldset of zoom search and simplify some code 2012-08-01 22:07:32 +05:30
Madhura Jayaratne
d5bf4f0874 Remove outer fieldset 2012-08-01 21:49:46 +05:30
Madhura Jayaratne
8ff3ab8854 Remove trailing white spaces 2012-08-01 21:37:54 +05:30
Marc Delisle
82293cf450 Merge pull request #85 from madhuracj/master 
Removing redundant 'Export privileges for all users' link
 2012-08-01 07:06:55 -07:00
Madhura Jayaratne
e51499d33c Remove 'export privileges for all users' link as it is now redundant 2012-08-01 16:59:36 +05:30
Madhura Jayaratne
4f3072bd20 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-08-01 16:46:13 +05:30
Madhura Jayaratne
f4c4fe8ebe White space clean up 2012-08-01 16:17:13 +05:30
Madhura Jayaratne
3242c5fb74 Coding style improvements and white space cleanup 2012-08-01 15:36:31 +05:30
Michal Čihař
63f3cf7d2f Merge remote-tracking branch 'alex/plugins-and-OOP' 2012-08-01 10:10:09 +02:00
Michal Čihař
706205d766 Merge remote-tracking branch 'yasitha/master' 2012-08-01 10:07:02 +02:00