Michal Čihař
|
073c76aea2
|
Merge remote-tracking branch 'chanaka/master'
|
2012-08-06 09:05:06 +02:00 |
|
Michal Čihař
|
e647743ad3
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-08-06 09:04:44 +02:00 |
|
Michal Čihař
|
fdfffabda3
|
Merge pull request #84 from roccivic/autoselect-login-form
Autoselect username input on cookie login page
|
2012-08-05 23:58:57 -07:00 |
|
Chanaka Indrajith
|
bb8fa38e87
|
Merge remote branch 'upstream/master'
|
2012-08-06 06:43:59 +05:30 |
|
Chanaka Indrajith
|
4beb0442ae
|
Clear tranformation information when deleting Columns, VIEWs, Tables and Databses
|
2012-08-06 06:43:16 +05:30 |
|
Weblate
|
23e04aeef2
|
Merge remote-tracking branch 'origin/master'
|
2012-08-05 13:21:01 +02:00 |
|
Aputsiaq Niels Janussen
|
a3f1a92484
|
Translated using Weblate.
|
2012-08-05 13:20:57 +02:00 |
|
Chanaka Indrajith
|
78129140fd
|
Code improvements related to VIEW transformations
|
2012-08-05 09:53:16 +05:30 |
|
Thilina Buddika
|
ed8cc33285
|
PMA_getQueryAndResultForReorderingTable() implementation and formatting
|
2012-08-05 08:49:48 +05:30 |
|
Thilina Buddika
|
8ac274d10a
|
Merge remote-tracking branch 'upstream/master'
|
2012-08-05 07:48:08 +05:30 |
|
Thilina Buddika
|
6e09a158df
|
missing function parameter
|
2012-08-05 07:34:51 +05:30 |
|
Thilina Buddika
|
ed96b32fbd
|
missing html clos tags
|
2012-08-05 07:29:45 +05:30 |
|
Aputsiaq Niels Janussen
|
9c16007d00
|
Translated using Weblate.
|
2012-08-05 01:36:53 +02:00 |
|
Chanaka Indrajith
|
eadf6dc1ce
|
Merge remote branch 'upstream/master'
|
2012-08-05 01:40:19 +05:30 |
|
Chanaka Indrajith
|
c5f0f86182
|
Support for transformations inside VIEWs created using create view link
|
2012-08-05 01:39:48 +05:30 |
|
Madhura Jayaratne
|
fa61beb385
|
Coding style fixes
|
2012-08-04 22:42:07 +05:30 |
|
Thilina Buddika
|
2f0b535fa6
|
Typo in function name
|
2012-08-04 22:32:22 +05:30 |
|
Madhura Jayaratne
|
4de69abcf7
|
Merge branch 'QA_3_5'
Conflicts:
pmd_general.php
|
2012-08-04 22:18:41 +05:30 |
|
Weblate
|
8ed1734f6b
|
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
|
2012-08-04 18:45:59 +02:00 |
|
Burak Yavuz
|
9fe91fbec2
|
Translated using Weblate.
|
2012-08-04 18:45:54 +02:00 |
|
shanyan baishui
|
b00ae196db
|
Translated using Weblate.
|
2012-08-04 18:45:51 +02:00 |
|
Madhura Jayaratne
|
7e3924e318
|
[interface] Designer sometimes places tables on the top menu
|
2012-08-04 22:15:04 +05:30 |
|
Thilina Buddika
|
626e6376a7
|
remove duplicate code
|
2012-08-04 22:06:52 +05:30 |
|
Thilina Buddika
|
8625fc6edd
|
missing function parameters
|
2012-08-04 20:24:18 +05:30 |
|
Weblate
|
c73b3589a9
|
Merge remote-tracking branch 'origin/master'
|
2012-08-04 12:40:28 +02:00 |
|
Burak Yavuz
|
b3f5413f4c
|
Translated using Weblate.
|
2012-08-04 12:40:25 +02:00 |
|
renwar kurd
|
762f1e1e2f
|
Translated using Weblate.
|
2012-08-04 12:40:21 +02:00 |
|
shanyan baishui
|
968cea0809
|
Translated using Weblate.
|
2012-08-04 12:40:18 +02:00 |
|
Rouslan Placella
|
c9fe310512
|
Fixed docblock
|
2012-08-04 12:39:58 +02:00 |
|
Thilina Buddika
|
10abc6636a
|
Merge branch 'master' of github.com:thilinaa/phpmyadmin
|
2012-08-04 04:46:14 +05:30 |
|
Thilina Buddika
|
40364f9507
|
upstream merge
|
2012-08-04 04:43:54 +05:30 |
|
Marc Delisle
|
8fd5339401
|
Merge branch 'QA_3_5'
|
2012-08-03 13:06:46 -04:00 |
|
Marc Delisle
|
3110bacb81
|
3.5.2.1 release date
|
2012-08-03 13:06:28 -04:00 |
|
Marc Delisle
|
ecca0cf8db
|
Merge branch 'MAINT_3_5_2' into QA_3_5
|
2012-08-03 13:05:13 -04:00 |
|
Marc Delisle
|
4b133e277f
|
3.5.2.1 release date
|
2012-08-03 13:05:05 -04:00 |
|
Marc Delisle
|
388484da60
|
Merge branch 'MAINT_3_5_2' into QA_3_5
|
2012-08-03 13:04:13 -04:00 |
|
Marc Delisle
|
b02670136f
|
3.5.2.1 release
|
2012-08-03 13:03:59 -04:00 |
|
Weblate
|
cbee90e6fb
|
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
|
2012-08-03 18:57:15 +02:00 |
|
Marc Delisle
|
216878b987
|
Merge branch 'QA_3_5'
|
2012-08-03 12:57:12 -04:00 |
|
Ashiyane Digital Security Team
|
3bf16a9f51
|
Translated using Weblate.
|
2012-08-03 18:57:12 +02: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 |
|
