gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,226 Commits 12 Branches 481 Tags 2.4 GiB
9dbf6cb218
Commit Graph

2998 Commits

Author SHA1 Message Date
Michal Čihař
c0b5286562 Merge branch 'master' of git://github.com/thesocialgeek/phpmyadmin into thesocialgeek-master 
Conflicts:
	js/navigation.js
 2013-09-30 14:16:40 +02:00
Kamran
6c22016fa4 Code Optimization: Removing un-needed method call to toLowerCase() 2013-09-30 14:05:53 +02:00
Michal Čihař
eb86ce0416 Coding style: whitespace around operators 2013-09-30 11:25:23 +02:00
Michal Čihař
26e990169f Coding style: whitespace around operators 2013-09-30 11:24:11 +02:00
Michal Čihař
501cb5a743 Coding style: use {} for if statements 2013-09-30 11:22:24 +02:00
Michal Čihař
65aa3af8ff Coding style: whitespace after keyword 2013-09-30 11:21:09 +02:00
Michal Čihař
0f898c2758 Coding style: missing semicolon 2013-09-30 11:20:43 +02:00
Michal Čihař
555b2fcc8a Coding style: fixed indentation 2013-09-30 11:20:15 +02:00
Michal Čihař
a0f87154f7 Coding style: fixed whitespace 2013-09-30 11:18:07 +02:00
Michal Čihař
127b2488f1 Add missing semicolons 2013-09-30 11:16:31 +02:00
Michal Čihař
e45b0aea08 Remove extra , 2013-09-30 11:14:27 +02:00
Michal Čihař
68fd6dd6b0 Add missing space 2013-09-30 11:14:03 +02:00
Michal Čihař
addb363cdb Move tracekit library to separate folder 
This makes it somehow separated from our code
 2013-09-30 09:17:03 +02:00
Michal Čihař
31169d72de Fixed spacing in javascript code 2013-09-30 09:15:44 +02:00
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
Madhura Jayaratne
933a68f1ef Send server only if its available 2013-09-29 22:49:57 +05:30
Madhura Jayaratne
7fc78b123a Add missing semicolon 2013-09-29 22:41:41 +05:30
Madhura Jayaratne
1ee543d01c Send server as well 2013-09-29 21:57:23 +05:30
Marc Delisle
c0125f96a7 Merge pull request #715 from thesocialgeek/master 
Update navigation.js to allow regex based search in quick filter (client side)
 2013-09-29 04:16:04 -07:00
Alicja Cwierz
e748b7cd60 Replace wiki info icon #1457 2013-09-28 18:57:53 +10:00
Marc Delisle
6dadb93ad1 Merge branch 'QA_4_0' 2013-09-26 14:47:04 -04:00
Spun Nakandala
7eb7286393 Bug fix 4074 2013-09-26 14:35:46 -04:00
Kamran
87cb022f16 Update navigation.js 
allow regex based search in quick filter (javascript side)
 2013-09-26 16:45:02 +02:00
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
Marc Delisle
5f5d6be015 Fix typo 2013-09-21 11:44:30 -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
Mohamed Ashraf
c5d2d51007 Error reporting now fails gracefully on dev builds 2013-09-21 00:42:00 +02:00
Madhura Jayaratne
f897c32e73 Coding style fix 2013-09-19 15:31:55 +05:30
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
bd968121aa Merge pull request #703 from kasunchathuranga/navSelect 
Open its table container when a database is selected
 2013-09-18 11:04:08 -07:00
Kasun Chathuranga
74d1dd5423 Open its table container when a database is selected 2013-09-18 22:54:03 +05:30
Marc Delisle
a5f20214fe Js confirm for drop view in Operations 2013-09-17 11:03:00 -04:00
Michal Čihař
d53bbe777a End sentence with comma 2013-09-12 10:41:48 +02:00
Michal Čihař
da664c9947 End sentence with comma 2013-09-12 10:40:48 +02:00
Madhura Jayaratne
e345d72a52 Line wrapping for CodeMirror edit areas 2013-09-09 18:58:36 +05:30
Mohamed Ashraf
2bb923284c Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-05 20:12:28 +02:00
Mohamed Ashraf
ed4771586f Returned the cache setting to the get_scripts.js.php file 2013-09-05 20:02:16 +02:00
Mohamed Ashraf
daf558637d Removed the error throwing function 2013-09-05 19:59:31 +02:00
Marc Delisle
50cb1928eb Merge commit '6693a9e' 2013-09-05 07:31:17 -04:00
Kasun Chathuranga
6693a9ebb3 Proceed only if the database is found 2013-09-05 07:24:50 +05:30
Kasun Chathuranga
8d70cd4dec Merge branch 'QA_4_0' into merge. Resolved conflicts. 2013-09-03 14:13:02 +05:30
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
Kasun Chathuranga
9c8267a9a8 Properly open and select database when "Use <db>" command is issued 2013-08-31 12:42:45 +05:30
Kasun Chathuranga
6f29a89aec Make scrolling work for table/views as well 2013-08-31 07:18:31 +05:30
Kasun Chathuranga
b43f4c7fed Expand the navigation and highlight the current database or table/view 2013-08-30 12:30:05 +05:30
Isaac Bennetch
fa87bcec06 Merge pull request #582 from kasunchathuranga/fractionalSecs 
Use fractional seconds in time, datetime and timestamp
 2013-08-27 06:37:30 -07:00
Atul Pratap Singh
f7e298bbf4 Remove multiple navigation reloads, fix autoexpand on use query 2013-08-27 17:34:45 +05:30
Atul Pratap Singh
278145ffd3 Hide throbber on navigation reload 2013-08-27 16:56:09 +05:30