gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,872 Commits 12 Branches 481 Tags 2.4 GiB
d248f77458
Commit Graph

204 Commits

Author SHA1 Message Date
Michal Čihař
bfa6282083 Merge branch 'QA_4_0' 2013-06-05 10:04:57 +02:00
Michal Čihař
eb29af585a Allow customization of CSP headers 
This is useful for inserting custom javascript in header/footer files.
 2013-06-05 10:04:06 +02:00
Marc Delisle
e6b1391af9 Fix merge conflicts 2013-05-28 08:49:37 -04:00
Marc Delisle
ec6a47d8a0 bug #3957 Cookies must be enabled past this point 2013-05-28 08:46:04 -04:00
Michal Čihař
2af13548da Drop not used colorize addon 2013-05-24 10:06:53 +02:00
Michal Čihař
e03449460a Highlight SQL using CodeMirror 2013-05-24 09:59:38 +02:00
Madhura Jayaratne
b6baa38dbd Merge branch 'QA_4_0' 2013-05-22 14:39:11 +05:30
Madhura Jayaratne
60d662be34 bug #3941 Recent tables list always empty 2013-05-22 14:36:01 +05:30
Michal Čihař
4fa3f06d23 Upgrade CodeMirror to 3.13 2013-05-21 09:41:04 +02:00
Bojan Petkovski
e9f5a30ae5 ReCaptcha https and CSP bug fixes 2013-05-11 17:53:34 +02:00
Bojan Petkovski
1832c8fa33 ReCaptcha feature 2013-05-11 17:53:32 +02:00
Michal Čihař
384f2cd79e Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	js/pmd/history.js
	libraries/Config.class.php
 2013-05-02 10:13:18 +02:00
J.M
1347575ee7 Fix bug #3900 CSP WARN in Firefox console 2013-05-01 17:56:04 +02:00
Madhura Jayaratne
b09b612579 Merge branch 'QA_4_0' 2013-04-14 23:39:48 +05:30
Madhura Jayaratne
f9859a013c Revert 0862f0a1ee. This was suppose to be a part of the pull request 247, however erroneously merged to master. Hence reverting. 2013-04-13 18:34:02 +05:30
Madhura Jayaratne
637be71f0c Allow loading map tiles when HTTPS is not used 2013-04-13 17:23:35 +05:30
Madhura Jayaratne
0862f0a1ee Allow loading map tiles when HTTPS is not used 2013-04-13 17:06:31 +05:30
J.M
0458afab28 Add HTML class for current browser and version 2013-04-08 13:00:21 +02:00
Marc Delisle
58a8e37de4 Comment about the best place to include CodeMirror 2013-04-01 07:44:03 -04:00
Kasun Chathuranga
71e96e7590 Fix bug #3835 Disabling CodeMirror in GUI settings does not actually disable it 2013-03-31 16:30:48 +05:30
Marc Delisle
7d2d883966 Fix merge conflicts 2013-03-25 19:57:27 -04:00
Michal Čihař
6c4aedbac2 Fix typo 2013-02-12 15:54:49 +01:00
Michal Čihař
5e7e416dab Merge remote-tracking branch 'origin/QA_3_5' 
Conflicts:
	libraries/header_http.inc.php
 2013-02-12 14:15:12 +01:00
Marc Delisle
bd3828754c Bug #3784 Disabling "Confirm DROP queries" in user preferences does not make the confirmations go away 2013-02-05 17:52:18 -05:00
Rouslan Placella
e486798850 Include keyhandler.js globally 2013-02-03 08:38:11 -05:00
Madhura Jayaratne
5b271e1ad8 Apply print.css to both print and print view 2013-01-25 19:45:37 +05:30
Marc Delisle
6aaafcad27 Final removal of qtip 2013-01-09 08:05:22 -05:00
Marc Delisle
3206db75e7 Continue converting to jQuery UI tooltip 2013-01-02 08:37:24 -05:00
Marc Delisle
5e8f6efd0b - port CSP policy changes done for Chrome in commit 
8c8099e2f7
- add 'unsafe-eval' due to the newer jQuery library
 2013-01-02 07:50:42 -05:00
Marc Delisle
431df615f2 Upgraded to jquery-ui-timepicker-addon 1.1.1 2013-01-01 11:50:04 -05:00
Rouslan Placella
45e181af33 Upgraded jquery drag library to v2.2 2012-12-20 18:10:56 +00:00
Rouslan Placella
501e3a9f2c Upgraded jquery and jquery-ui 2012-12-19 14:50:36 +00:00
Rouslan Placella
c9f05828f6 Fixed bug #3590624 - PHP error in Header class 2012-12-14 20:05:17 +00:00
Marc Delisle
e41e0f4a64 - use the previous idea of clicking anywhere on the bar 
- advertise this idea with the icon's link
 2012-12-09 07:08:48 -05:00
Rouslan Placella
5e33ec73d8 Use icon for scroll to top functionality 2012-12-05 20:52:55 +00:00
Rouslan Placella
6446faa2d5 Show messages from incoming request parameters 2012-11-27 15:06:05 +00:00
Rouslan Placella
2e1bc1bd8d Refactored menuPrepare and menuResize into a jQuery plugin 
Also integrated this plugin with both the main menu and the resizable
menu on the table structure page
 2012-11-24 17:25:37 +00:00
Rouslan Placella
177b459822 Fixed bug #3583315 - Query doesn't load in the querywindow when clicking on edit 2012-11-19 23:36:05 +00:00
Rouslan Placella
9db53f4c02 Use jquery.debounce instead of custom code to speed up navigation scroll and resize handlers 2012-11-11 15:45:28 +00:00
Rouslan Placella
c573b0c566 Moved setUrlHash module into ajax.js 2012-11-06 15:20:53 +00:00
Michal Čihař
8f35f7c9d7 Theme mighe be not available in fatal error case 2012-11-01 09:12:54 +01:00
Rouslan Placella
6e51172183 Update libraries/Header.class.php 2012-10-31 11:33:17 +00:00
Rouslan Placella
f08d23c688 Fixed another undefined index error 2012-10-31 11:28:53 +00:00
Rouslan Placella
f740c0b09d No output when the header is disabled 2012-10-31 09:45:04 +00:00
Rouslan Placella
08efd1e7c8 Fixed invalid function call 2012-10-30 20:29:01 +00:00
Rouslan Placella
5b0b9e42fe Update new code to use PMA_Util 2012-10-30 20:24:01 +00:00
Rouslan Placella
483dab2feb phpcs fixes 2012-10-30 20:24:01 +00:00
Rouslan Placella
34a7d63e06 Force IE out of compatibility mode 2012-10-30 20:24:00 +00:00
Rouslan Placella
753e1f3648 Initial implementation of microhistory 2012-10-30 20:24:00 +00:00
Rouslan Placella
3d8cf0f716 Dropped dead code 2012-10-30 20:24:00 +00:00
Rouslan Placella
dc04f8f80a Display the message (with the outcome of the execution of the query) after ajax page requests 2012-10-30 20:24:00 +00:00
Rouslan Placella
7356b407ad Rewrite and integration of js/common.js 2012-10-30 20:23:59 +00:00
Rouslan Placella
eedf07e915 Dropped getReloadNavigationScript(), this is already handled by Footer.class.php 2012-10-30 20:23:59 +00:00
Rouslan Placella
50266d206b Fixed updating of the title of the page 2012-10-30 20:16:58 +00:00
Rouslan Placella
3dc9897561 Renamed configuration directive: LeftRecentTable => NumRecentTables 2012-10-30 20:16:57 +00:00
Rouslan Placella
d7e0bed284 Dropped configuration directive: AllowThirdPartyFraming 2012-10-30 20:16:56 +00:00
Rouslan Placella
ecc4ba6426 Added ajax behaviour to indexes in the navigation tree 2012-10-30 20:10:23 +00:00
Rouslan Placella
69bf128936 Moved all the JS functionality for RTE into a single file 2012-10-30 20:10:22 +00:00
Rouslan Placella
aba183c386 Preload the navigation tree to save an ajax request and don't store the pagination position in the session 2012-10-30 20:10:21 +00:00
Rouslan Placella
639d4e570b Implemented navigation scrolling 2012-10-30 20:10:21 +00:00
Rouslan Placella
d73f2bf2b9 Moved the navigation header class to the folder it belongs to 2012-10-30 20:10:21 +00:00
Rouslan Placella
c21afeb2dc Implemented resizing and collapsing of the navigation 2012-10-30 20:10:21 +00:00
Rouslan Placella
4d4c8a9bad Update recent tables through index,php instead of navigation.php 2012-10-30 20:10:20 +00:00
Rouslan Placella
1b69d0bf55 Drop the target attrbute from links and forms 2012-10-30 20:10:20 +00:00
Rouslan Placella
00f1c076dd Ignore recent tables functionality when not logged in 2012-10-30 20:10:20 +00:00
Rouslan Placella
907359020b Invalidate CSS cache when language direction is changed 2012-10-30 20:10:20 +00:00
Rouslan Placella
69b81e843b Added ajax-loaded navigation to the main page 2012-10-30 20:07:02 +00:00
Rouslan Placella
2737754356 Displaying the $message is not the job of the Menu class 2012-10-30 20:07:01 +00:00
Rouslan Placella
5486bdb312 Implemented page, menu and scripts loading via ajax 2012-10-30 20:04:52 +00:00
Rouslan Placella
321acfd277 Wrap page content in a DIV tag 2012-10-30 20:04:51 +00:00
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Michal Čihař
0a21c865e2 Load JSON rather than javascript from phpmyadmin.net 2012-08-31 15:47:05 +02:00
Chanaka Indrajith
038a81b1a8 Resolved comflicts 2012-06-28 06:10:43 +05:30
Madhura Jayaratne
98e1debafa Fix indentation 2012-06-27 23:09:38 +05:30
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Chanaka Indrajith
1cc49d32d9 Resolved conflicts 2012-06-27 07:06:34 +05:30
Michal Čihař
6a4ac7ef32 Do not emit headers when running testsuite 2012-06-25 12:17:33 +02:00
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Michal Čihař
4886150744 Correct usage of ob_end_clean and ob_get_contents 2012-06-18 10:01:59 +02:00
Rouslan Placella
dc8f882919 Set headerIsSent property of PMA_Header class as private, 
as it's no longer necessary to access it externally
 2012-06-12 14:21:48 +01:00
Rouslan Placella
007b10e90a Moved lost global 2012-06-12 14:07:00 +01:00
Rouslan Placella
1c01c222ef Coding style fixes 2012-06-12 14:04:39 +01:00
Rouslan Placella
11ccc10951 Moved the check for whether warnings are enabled inside function 2012-06-11 14:06:04 +01:00
Rouslan Placella
c7d835347c Force JSON response for AJAX requests 2012-06-11 14:06:04 +01:00
Rouslan Placella
a3d7a055ee Docblock fixes 2012-06-11 14:06:04 +01:00
Rouslan Placella
ca2f161948 Dropped $GLOBALS['page_title'] 2012-06-11 14:06:04 +01:00
Rouslan Placella
ae6e50a8a8 Drop display() from Header and Footer classes. The Response class will do all the rendering. 2012-06-11 14:06:04 +01:00
Rouslan Placella
ec4b3d9e46 Disable warnings in header for cookie auth 2012-06-11 14:06:04 +01:00
Dieter Adriaenssens
9c14442877 Fix typo 2012-06-11 14:06:04 +01:00
Rouslan Placella
5765eaabb0 Don't force 'text/html' on ajax requests 2012-06-11 14:06:03 +01:00
Rouslan Placella
d9bedbd75e Finished integrating the PMA_Footer class 2012-06-11 14:06:03 +01:00
Rouslan Placella
41cb6e20b0 Added PMA_OutputBuffering class, dropped ob.lib.php 2012-06-11 14:06:03 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
d5fa1c666f Handle scripts in the PMA_Footer class 2012-06-11 14:06:03 +01:00
Rouslan Placella
de36567ea6 Docblocks and coding style fixes for the new classes 2012-06-11 14:06:03 +01:00
Rouslan Placella
da1e70e1fb Integrated authentication libraries with PMA_Header class 2012-06-11 14:06:03 +01:00
Rouslan Placella
a14da7bd5a Small code cleanup 2012-06-11 14:06:03 +01:00
Rouslan Placella
afb5600e7e Dropped header_http.inc.php 2012-06-11 14:06:03 +01:00
Rouslan Placella
ada9c98c0c Integrated print view functionality into the PMA_Header class 2012-06-11 14:06:03 +01:00
Rouslan Placella
bf0b05297c PMA_Header::$headerIsSent must be static 2012-06-11 14:06:03 +01:00
Rouslan Placella
a1e255dde4 Drop constant PMA_DISPLAY_HEADING 2012-06-11 14:06:03 +01:00
Rouslan Placella
88c899ff6a The PMA_Menu class no longer need to be a singleton 2012-06-11 14:06:02 +01:00
Rouslan Placella
54d47b89db Use PMA_Header class in themes.php 2012-06-11 14:06:02 +01:00
Rouslan Placella
97449dae42 New classes PMA_Header and PMA_Scripts 2012-06-11 14:06:02 +01:00