Commit Graph

74761 Commits

Author SHA1 Message Date
Jan Pecek
0970a3eac0 Add new config value for hide action columns to drop down menu or not (frID: 3475567) 2012-04-16 15:20:02 +02:00
Madhura Jayaratne
cc116f1d2d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-15 19:56:23 +05:30
Dieter Adriaenssens
9e26163f12 Merge pull request #33 from niveuseverto/fix-show_git_commit
Pull request #29 broke phpmyadmin to me...
2012-04-15 06:57:12 -07:00
Alexander Filippov
ff455cc96a fixed error: Parse error: syntax error, unexpected '[' in ./libraries/display_git_revision.lib.php on line 56 2012-04-15 12:40:14 +00:00
Marc Delisle
f93d1e665b Merge pull request #29 from mynetx/show_git_commit
Show Git revision details in right main.php column
2012-04-15 03:47:35 -07:00
Madhura Jayaratne
4b61ab20df Parent element having class="choice" should be made visible 2012-04-15 15:27:45 +05:30
Jo Michael
569aed795c Drop view confirm properly, don't show truncate action for views 2012-04-15 06:11:11 +02:00
Jo Michael
05699a7ac4 Add Codemirror to tbl_replace (SQL box after inserting rows) 2012-04-15 05:40:39 +02:00
Jo Michael
230e447887 Fix missing space after Profiling checkbox 2012-04-15 02:12:29 +02:00
Jo Michael
6888be9ec3 Cache commit data once read 2012-04-15 01:21:44 +02:00
Jo Michael
d6c28d3923 Show Git revision asynchronously 2012-04-15 01:15:30 +02:00
Jo Michael
0a52239900 Add support for repos that are not on any branch 2012-04-15 00:22:17 +02:00
Jo Michael
cd3b41fd25 Suppress error messages when trying to read non-existant .git/refs/heads/master file 2012-04-14 23:54:53 +02:00
Marc Delisle
e63d18bdb3 Shorten "Browse distinct values" action link and move it to last position 2012-04-14 16:59:01 -04:00
Jo Michael
582ac4d4d3 Fix Browse and Primary items missing from table actions more dropdown 2012-04-14 20:04:57 +02:00
Jo Michael
2824909ac7 Merge branch 'QA_3_5' 2012-04-14 19:30:01 +02:00
Jo Michael
b718db9c05 Fixed too much top margin of table structure more-actions when loading page in small window 2012-04-14 19:26:23 +02:00
Dieter Adriaenssens
0f772aa173 check if PHPMYADMIN is set 2012-04-14 16:51:26 +02:00
Jo Michael
06001a08e8 Use separate library file for displaying Git revision, minor fixes 2012-04-14 16:12:05 +02:00
Marc Delisle
d3266a202d verbose_check is no longer needed 2012-04-14 10:06:58 -04:00
Madhura Jayaratne
b991118914 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-14 17:50:45 +05:30
Madhura Jayaratne
10727d665b Code refactoring to remove some duplications 2012-04-14 17:47:14 +05:30
Madhura Jayaratne
8e62b92d70 Coding style improvements 2012-04-14 17:44:39 +05:30
Marc Delisle
e0637ba0c2 Merge branch 'QA_3_5' 2012-04-14 07:39:07 -04:00
ruleant
89a95661a6 Merge pull request #30 from wiltave/master
Small fixes
2012-04-14 04:38:38 -07:00
Marc Delisle
8b31dd3991 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-14 07:38:28 -04:00
Marc Delisle
ea17cef342 Fix merge conflicts 2012-04-14 07:38:03 -04:00
Marc Delisle
7738ec98e8 Merge branch 'QA_3_4' into MAINT_3_5_0 2012-04-14 07:36:52 -04:00
Marc Delisle
3345d64a6f 3.4.11 release 2012-04-14 07:35:22 -04:00
Madhura Jayaratne
ef68eaa254 Fix Checkstyle Warnings - Type: CloseBracketLine 2012-04-14 10:40:39 +05:30
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Willian Gustavo Veiga
bf540384ee Unnecessary "else" statement removed 2012-04-13 22:12:28 -03:00
Willian Gustavo Veiga
fca5517ae6 Small typo: "JavaScript" instead of "Java script" 2012-04-13 22:08:25 -03:00
Jo Michael
7ce27bb3d5 Show Git revision details in right main.php column (hover SHA1 to read commit message) 2012-04-14 00:02:06 +02:00
Jo Michael
e662600415 Calculate table action more_opts maximum width correctly 2012-04-13 19:34:10 +02:00
Jo Michael
92f8d794c7 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-04-13 19:24:22 +02:00
Jo Michael
b2aee016c4 Calculate table action more_opts maximum width correctly 2012-04-13 19:23:51 +02:00
Madhura Jayaratne
ba21546008 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-13 22:33:43 +05:30
Madhura Jayaratne
6b2a502de7 Merge branch 'QA_3_5' 2012-04-13 22:32:19 +05:30
Marc Delisle
7e00134398 Merge pull request #26 from mynetx/codemirror_enable
Allow disabling CodeMirror
2012-04-13 09:41:23 -07:00
Madhura Jayaratne
ea800101cb Fix Checkstyle Warnings - Type: BraceOnSameLine 2012-04-13 21:50:26 +05:30
Madhura Jayaratne
fa9aaea8c0 Coding style improvements 2012-04-13 20:57:17 +05:30
Madhura Jayaratne
3af218eb76 Make some messages translatable 2012-04-13 19:56:47 +05:30
Michal Čihař
dac767f3c4 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-13 10:07:23 +02:00
Madhura Jayaratne
2707c6c463 Translated using Weblate. 2012-04-13 10:06:35 +02:00
Jo Michael
8744f8cf66 + rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false 2012-04-13 01:43:32 +02:00
Michal Čihař
1fc4e7cafd Merge remote-tracking branch 'origin/master' 2012-04-12 23:40:33 +02:00
Madhura Jayaratne
d43c1de210 Translated using Weblate. 2012-04-12 23:40:28 +02:00
Marc Delisle
6557b71b88 ChangeLog entry
Protect script contents with CDATA, see
https://developer.mozilla.org/En/Properly_Using_CSS_and_JavaScript_in_XHTML_Documents
2012-04-12 17:38:59 -04:00
Atul Pratap Singh
5ab6e746b8 Patch #3517040 Login screen appears under the page 2012-04-12 17:31:54 -04:00