Mohamed Ashraf
|
a2659d7ba5
|
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
ChangeLog
|
2013-09-29 23:13:05 +02:00 |
|
Marc Delisle
|
046c9a578b
|
ChangeLog entry for rfe 1463
|
2013-09-29 07:29:37 -04:00 |
|
Marc Delisle
|
447965f984
|
Fix merge conflicts
|
2013-09-28 12:48:30 -04:00 |
|
Madhura Jayaratne
|
565c65ef8b
|
Merge branch 'QA_4_0'
|
2013-09-28 19:55:55 +05:30 |
|
Madhura Jayaratne
|
1559343ace
|
bug #4109 Drizzle tables in navigation are shown as views
|
2013-09-28 19:47:37 +05:30 |
|
Marc Delisle
|
67ae6c54c6
|
ChangeLog entry for rfe 1457
|
2013-09-28 06:48:45 -04:00 |
|
Marc Delisle
|
6dadb93ad1
|
Merge branch 'QA_4_0'
|
2013-09-26 14:47:04 -04:00 |
|
Marc Delisle
|
5cc7133d3d
|
ChangeLog entry for bug 4074 fix
|
2013-09-26 14:36:52 -04:00 |
|
Marc Delisle
|
399f6af722
|
Fix merge conflicts
|
2013-09-26 08:54:09 -04:00 |
|
Marc Delisle
|
809138c4f1
|
bug #3996 Drizzle navigation doesn't expand
|
2013-09-26 07:45:18 -04:00 |
|
Marc Delisle
|
6706fc1f9a
|
Fix merge conflicts
|
2013-09-25 12:30:37 -04:00 |
|
Marc Delisle
|
a775270d9b
|
bug #4103 Tracking report: cannot delete a statement
|
2013-09-25 12:24:44 -04:00 |
|
Madhura Jayaratne
|
511a005281
|
Merge branch 'QA_4_0'
|
2013-09-25 06:46:04 +05:30 |
|
Madhura Jayaratne
|
352c60d4ca
|
bug #4102 ALTER TABLE ORDER BY and InnoDB
|
2013-09-25 06:43:15 +05:30 |
|
Madhura Jayaratne
|
381b4b58aa
|
Merge branch 'QA_4_0'
|
2013-09-24 22:34:16 +05:30 |
|
Madhura Jayaratne
|
1d6bb8ed6b
|
bug #4100 table tree group strategy
|
2013-09-24 22:27:47 +05:30 |
|
Marc Delisle
|
668c55a437
|
Fix merge conflicts
|
2013-09-24 06:55:16 -04:00 |
|
Marc Delisle
|
256fcb61fe
|
bug #4099 Server/library difference warning: setting is ignored
|
2013-09-24 06:49:39 -04:00 |
|
Marc Delisle
|
c38b002226
|
Merge branch 'QA_4_0'
|
2013-09-23 12:33:08 -04:00 |
|
Marc Delisle
|
5ffeac5b57
|
4.0.7 release
|
2013-09-23 12:32:48 -04:00 |
|
Madhura Jayaratne
|
80b7056a65
|
Merge branch 'QA_4_0'
|
2013-09-23 19:24:44 +05:30 |
|
Madhura Jayaratne
|
35de20e86b
|
bug #4098 Default table tab is ignored
|
2013-09-23 19:16:54 +05:30 |
|
Marc Delisle
|
00b20b70e8
|
Merge branch 'QA_4_0'
|
2013-09-22 09:55:59 -04:00 |
|
Marc Delisle
|
509970d9e8
|
bug #4002 Edit Index on big table does not show "Loading" or any message
|
2013-09-22 09:55:12 -04:00 |
|
Mohamed Ashraf
|
d90126ebd7
|
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
ChangeLog
scripts/create-release.sh
|
2013-09-21 00:49:01 +02:00 |
|
Marc Delisle
|
81bd6d4a02
|
Fix merge conflict
|
2013-09-20 06:09:36 -04:00 |
|
Marc Delisle
|
0134d5154f
|
bug #4060 Browser tries to remember wrong password when creating new user
|
2013-09-20 06:03:44 -04:00 |
|
Madhura Jayaratne
|
199a9e60bc
|
Merge branch 'QA_4_0'
Conflicts:
libraries/db_info.inc.php
|
2013-09-19 23:19:27 +05:30 |
|
Madhura Jayaratne
|
e8f734e31a
|
bug #3975 Table grouping isn't implemented properly
|
2013-09-19 23:13:47 +05:30 |
|
Marc Delisle
|
abdfff3f80
|
Merge pull request #702 from kasunchathuranga/newDatabase
Add 'new database' entry to navigation tree
|
2013-09-19 03:34:21 -07:00 |
|
Madhura Jayaratne
|
8840495828
|
Merge branch 'QA_4_0'
Conflicts:
js/makegrid.js
po/et.po
|
2013-09-19 15:31:03 +05:30 |
|
Madhura Jayaratne
|
e69bcce043
|
bug #4041 Interaction between linkified fields and grid editing
|
2013-09-19 15:24:53 +05:30 |
|
Marc Delisle
|
7dd3ed7315
|
Merge branch 'QA_4_0'
|
2013-09-18 13:07:08 -04:00 |
|
Marc Delisle
|
23d26377bf
|
bug #3988 Rename view is not working
|
2013-09-18 13:06:44 -04:00 |
|
Marc Delisle
|
9152158e2c
|
Fix merge conflicts
|
2013-09-18 07:58:17 -04:00 |
|
Marc Delisle
|
5b023232db
|
4.0.8-dev
|
2013-09-18 07:57:12 -04:00 |
|
Isaac Bennetch
|
ba0bf422ef
|
ChangeLog entry for commit fa87bcec06
|
2013-09-18 00:35:51 -04:00 |
|
Isaac Bennetch
|
b75b0634e1
|
Correction to ReCAPTCHA rfe number in ChangeLog
|
2013-09-18 00:26:26 -04:00 |
|
Kasun Chathuranga
|
601104d910
|
Add 'new database' entry to navigation tree
|
2013-09-18 09:43:11 +05:30 |
|
Marc Delisle
|
922c5f4e89
|
Merge commit '00ce00e'
|
2013-09-17 10:37:30 -04:00 |
|
Marc Delisle
|
00ce00edfc
|
bug #3986 Missing DROP VIEW button
|
2013-09-17 10:35:17 -04:00 |
|
Madhura Jayaratne
|
5638d6b956
|
Merge branch 'QA_4_0'
|
2013-09-17 16:51:07 +05:30 |
|
Madhura Jayaratne
|
f9300c7b07
|
bug #4001 Import error: Class 'ImportOds' not found
|
2013-09-17 16:49:06 +05:30 |
|
Madhura Jayaratne
|
cdd9312e65
|
bug #4000 "Table does not contain unique column" message appears after adding a unique column
|
2013-09-17 07:27:06 +05:30 |
|
Madhura Jayaratne
|
347dc5c27e
|
bug #4068 Headline in operations not readable in IE10
|
2013-09-15 19:03:24 +05:30 |
|
Madhura Jayaratne
|
ccfb9a8954
|
Merge branch 'QA_4_0'
Conflicts:
libraries/database_interface.lib.php
|
2013-09-15 13:22:21 +05:30 |
|
Madhura Jayaratne
|
988b1142ac
|
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
Conflicts:
ChangeLog
|
2013-09-15 13:18:05 +05:30 |
|
Madhura Jayaratne
|
5111eb7eb5
|
bug #4088 MySQL server version at index.php incorrect w/ controlhost
|
2013-09-15 13:16:00 +05:30 |
|
Marc Delisle
|
f2a939d24f
|
Merge branch 'QA_4_0'
|
2013-09-14 09:37:32 -04:00 |
|
Marc Delisle
|
830d94a7a8
|
ChangeLog entry for bug 4079
|
2013-09-14 09:36:40 -04:00 |
|
