nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,584 Commits 1 Branch 0 Tags
4ea81c2086f57aadf147d6de7445f4136db14224
Commit Graph

4423 Commits

Author SHA1 Message Date
Michal Čihař
42f04d4a7e Avoid precalculating counts. 
The count() on array is cheap in PHP and having hardcoded numbers only
tends to break.
 2010-08-30 14:50:28 +02:00
Michal Čihař
aa45363719 Correct count of words. 2010-08-30 14:47:14 +02:00
Michal Čihař
0d1b515769 Fixed detection of ods_col_names (bug #3056017). 2010-08-30 14:47:14 +02:00
ninadsp
d304002fc0 Re-initialize for each data field. It was being cleared in a BLOB field, which caused inline editing to fail for all further fields in that row 2010-08-30 08:36:18 -04:00
Michal Čihař
fdb0d32df4 Merge branch 'QA_3_3' 2010-08-30 14:18:02 +02:00
Michal Čihař
4a234050f2 bug #3054458 [core] Fixed displaying number of rows. 2010-08-30 14:17:51 +02:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +02:00
Michal Čihař
bf8a597d78 Remove dead code. 2010-08-30 10:54:17 +02:00
Michal Čihař
0c7e5b3f75 [bug #3055899] No footer file in ajax request. 2010-08-30 10:47:26 +02:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
Marc Delisle
7ca0657ff0 remove author names as per our policy 2010-08-29 08:54:12 -04:00
Crack
b17a2e4a85 user preferences: improve styling of fieldset headers, change Export form layout 2010-08-29 12:35:02 +02:00
Crack
4c6310e349 add Export/quick_export_onserver and Export/quick_export_onserver_overwrite to user preferences 2010-08-29 02:18:04 +02:00
Crack
06f472ed51 allow proper nesting of option groups in user preferences 2010-08-29 01:49:18 +02:00
Marc Delisle
56381c086f adapted patch #3050492 to new code 2010-08-28 08:57:27 -04:00
Marc Delisle
35c4fc35ee put back lost feature: changing paper size or orientation changes the scratchboard (todo: improve the interface to show that these are not only related to the Display dialog) 2010-08-28 08:45:29 -04:00
Crack
c0482e135b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-28 12:12:52 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Michal Čihař
ac5cab4f6f These should be translatable as well. 2010-08-27 16:16:54 +02:00
Marc Delisle
c9d4d52fff correct template variable 2010-08-27 10:03:52 -04:00
Crack
a82b355fc9 simplified PMA_SETUP checks 2010-08-27 15:57:45 +02:00
Crack
1dba66c13f user cannot restore a setting to its default value if it's set in config.inc.php 2010-08-27 15:55:06 +02:00
Herman van Rink
51c9c1763e Code cleanup, mostly added extra spaces 2010-08-26 17:01:12 +02:00
ninadsp
43c18c50b8 Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it 2010-08-26 20:19:51 +05:30
Herman van Rink
58f8ebc23c Merge branch 'master' into gsoc2010-blinky 2010-08-26 09:54:42 +02:00
Herman van Rink
e076ec85e1 Add vim mode lines 2010-08-25 17:07:08 +02:00
Herman van Rink
6fb5591f4e Add CDATA to script code 2010-08-25 17:07:02 +02:00
Herman van Rink
b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky 
Conflicts:
	Documentation.html - renumbered 6.28 to 6.29
 2010-08-25 16:59:54 +02:00
Michal Čihař
1b58bc993e Fix description of config option. 2010-08-25 09:32:11 +02:00
Michal Čihař
99975dfc17 Merge branch 'QA_3_3' 
Conflicts:
	test/PMA_headerLocation_test.php
 2010-08-25 09:30:12 +02:00
Herman van Rink
d1e9585c9e Merge branch 'QA_3_3' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_3 2010-08-24 15:17:11 +02:00
ninadsp
7f9d141a85 Removed the blank new line at the end, which was causing issues 2010-08-24 18:25:09 +05:30
Herman van Rink
45bdf8f522 Add additional condition for strict checking. 2010-08-24 14:47:29 +02:00
Michal Čihař
5c63cbd231 Merge branch 'QA_3_3' 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-08-23 17:10:04 +02:00
Michal Čihař
362251abbf Merge branch 'MAINT_3_3_6' into QA_3_3 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-08-23 17:08:58 +02:00
Michal Čihař
133a77fac7 Escape backtrace listing to avoid possible XSS on this. 2010-08-23 17:05:53 +02:00
Michal Čihař
a24e418527 Avoid PHP error when false is passed to PMA_DBI_getError. 
This can be caused by controllink set to false.
 2010-08-23 17:02:15 +02:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
Michal Čihař
8a011f77b8 Better name for schema export script. 2010-08-23 10:55:57 +02:00
Michal Čihař
f84659efcb Better file name for schema edit page. 2010-08-23 10:55:19 +02:00
Michal Čihař
1c20d31e65 No upper case in box title. 2010-08-23 10:52:46 +02:00
Michal Čihař
ab03dc8d5c Whitespace cleanup. 2010-08-23 10:50:17 +02:00
Michal Čihař
2ea03801eb Better size of Dia export. 2010-08-23 10:33:05 +02:00
Michal Čihař
dd80998080 Merge remote branch 'adnan/export_branch' 2010-08-23 10:21:22 +02:00
ninadsp
6a2445ccf2 Fixed the error caused due to a missing index , relocated the code that sets the null class for a null element 2010-08-22 12:59:25 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Marc Delisle
9036ac09e3 3.3.7-dev 2010-08-20 13:03:13 -04:00
Marc Delisle
1e7bc7d691 3.3.6-rc1 2010-08-20 12:59:21 -04:00
Marc Delisle
7be8236208 comment was no longer accurate 2010-08-20 08:46:59 -04:00