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

73 Commits

Author SHA1 Message Date
Piotr Przybylski
0219728929 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-05 22:48:03 +02:00
Piotr Przybylski
36e1af721e Server Synchronize: display semicolon after executed queries 2011-08-05 22:36:12 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Piotr Przybylski
efa788d00d Synchronize: add missing arguments to a function, document possibly broken function 2011-08-05 17:12:46 +02:00
Piotr Przybylski
092108bdee Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-05 16:47:14 +02:00
Piotr Przybylski
9d7d5f960f Remove unused variables 2011-08-05 16:46:24 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
ca8a30f7f8 Fix usage of PMA_DBI_get_columns 2011-08-05 01:24:02 +02:00
Piotr Przybylski
c64564baf7 Server synchronize: fix PMA_get_table_indexes to return null when there are no indexes instead of false 
Synchronize code depends on this behavior
 2011-08-05 00:49:31 +02:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Piotr Przybylski
95e90bbba4 Comments and formatting 2011-08-03 23:56:02 +02:00
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-08-03 00:25:43 +02:00
Piotr Przybylski
54fbcaa140 Server synchronize: 
* change icons to 16x16
* fix tables layout
* merge 'Source' and 'Target' tables
 2011-08-02 23:30:51 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
 2011-07-21 15:25:52 +02:00
Michal Čihař
06655a8a96 Document that functions do not return anything 2011-07-21 14:58:47 +02:00
Michal Čihař
85e680c396 Remove function names used as first word in docblock 2011-07-21 14:45:52 +02:00
Michal Čihař
0d2c073065 Add parameter types 2011-07-21 14:43:54 +02:00
Michal Čihař
8aa62d4931 Minor fix in coding style 2011-07-21 14:41:52 +02:00
Michal Čihař
4c16ac5d06 Missing references in doc block 2011-07-21 14:41:37 +02:00
Michal Čihař
625a35bd87 Wrap some long lines 2011-07-21 14:40:46 +02:00
Michal Čihař
9fb8bf6ce6 Fix indentation 2011-07-21 13:41:55 +02:00
Michal Čihař
04b9b79c1c Fix coding style 2011-07-21 13:40:05 +02:00
Michal Čihař
64dd497a6f Fix indentation 2011-07-21 13:39:32 +02:00
Michal Čihař
56a3f0c874 Fix function docblock 2011-07-21 13:39:04 +02:00
Michal Čihař
ab1e5a3755 Fix function docblock 2011-07-21 13:38:14 +02:00
Michal Čihař
d1c5d981e5 Add file level docblock 2011-07-21 13:37:07 +02:00
Michal Čihař
a7b1a56b28 Fix indentation 2011-07-21 13:09:30 +02:00
Michal Čihař
7a3c021e85 Add param types 2011-07-21 11:58:13 +02:00
Michal Čihař
62c2c74583 Allign comments 2011-07-21 11:54:30 +02:00
Michal Čihař
719861c8a8 Fix variable names 2011-07-21 11:53:26 +02:00
Michal Čihař
037224c85e if and elseif coding style 2011-07-21 11:52:50 +02:00
Michal Čihař
e936ce72c5 Whitespace fixup 2011-07-21 11:51:42 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Michal Čihař
3d007a6097 Whitespace cleanup 2011-07-21 11:17:42 +02:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Piotr Przybylski
cfdf3aa7c3 Whitespace cleanup 
Removed @uses and fixed broken PHPDoc comments
 2011-07-03 13:21:13 +02:00
Marc Delisle
12fcc270f2 Merge branch 'QA_3_4' 2011-07-02 20:52:10 -04:00
Piotr Przybylski
0266ddd7bd Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-07-03 00:41:31 +02:00
Piotr Przybylski
6d88345404 Remove DBI from moved functions' names 2011-07-02 00:48:14 +02:00
Piotr Przybylski
e6b1d479cf Move PMA_DBI_get_column_values and PMA_DBI_get_table_indexes to server_synchronize.lib.php 
They are used only there, no need to parse 1,5 KB of code on every page load
 2011-07-02 00:45:08 +02:00
Herman van Rink
69fb0f8e7d Fixed regexp quoting issue in Synchronize code, see PMASA-2011-7 2011-06-30 13:26:29 +02:00
Piotr Przybylski
96c5c6dbc6 Add $column parameter to PMA_DBI_get_columns 2011-06-28 23:11:58 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Marc Delisle
626d6d8557 bug #3134495 [synchronization] Data containing single quotes prevents sync 2011-04-21 09:23:14 -04: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