nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,180 Commits 1 Branch 0 Tags
4bbeb365aead90bc9c21999776c9215545e8889c
Commit Graph

293 Commits

Author SHA1 Message Date
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +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
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
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
Michal Čihař
6aefc832ad Fixes for JSON plugin. 2010-08-19 14:05:04 +02:00
Michal Čihař
c7815a8650 Fix typo. 2010-08-19 11:47:39 +02:00
Michal Čihař
3f33397651 No need to translate SQL statements. 2010-08-19 11:31:28 +02:00
Michal Čihař
882892af23 Better translatable messages. 2010-08-19 11:30:44 +02:00
Michal Čihař
c5a3288396 Merge remote branch 'lori/gsoc' 2010-08-19 11:11:51 +02:00
Michal Čihař
1f248cc254 Simplify code to use native tcpdf functions. 2010-08-18 13:58:52 +02:00
lorilee
90c0e573f7 Fixed formatting 2010-08-10 20:43:57 -07:00
lorilee
1c0b81d477 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-08-09 13:36:31 -07:00
lorilee
6f833918e9 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-08-09 13:35:27 -07:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
Marc Delisle
a8852c5dc9 JSON exported file extension should be .json 2010-08-03 13:10:31 -04:00
Hauke Henningsen
5675555d5a patch #3038312 [export] JSON export 2010-08-03 13:08:21 -04:00
lorilee
765bfb6f40 Should be closing a group, not a subgroup 2010-08-02 13:14:41 -07:00
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
e5e340e525 Proper propagating of overrided values. 2010-07-21 10:16:30 +02:00
Michal Čihař
cb6716c481 Documentation in LaTeX format strings. 2010-07-21 10:11:35 +02:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +02:00
Michal Čihař
9b2aa3c40d Indentation. 2010-07-21 09:55:13 +02:00
Michal Čihař
715f2f04f6 Move messages to place where they are used. 2010-07-21 09:54:04 +02:00
Michal Čihař
7415caa4e4 LaTeX export uses PMA_expandUserString. 2010-07-21 09:51:24 +02:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
lorilee
8397112a67 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee 2010-07-16 16:54:59 -07:00
ninadsp
9dd93987ca Reverted po files changes. 2010-07-15 00:17:49 +05:30
lorilee
5fab0e993c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-14 11:33:45 -07:00
Marc Delisle
6ea41018b2 Merge branch 'QA_3_3' 2010-07-12 09:01:05 -04:00
Marc Delisle
768de14815 typo 2010-07-12 09:00:39 -04:00
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
lorilee
0900dc1b0b Fixed a formatting bug 2010-07-08 14:07:36 -07:00
lorilee
a62cc4d464 Changed "columns terminated with" to "columns separated with" 2010-07-08 13:40:50 -07:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
lorilee
301e3c43e3 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-28 20:50:26 -04:00
lorilee
f1a5ae3a9f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-28 20:49:56 -04:00
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +02:00
lorilee
8984ffffbb Modified label text, added "doc" links 2010-06-24 17:14:20 -04:00
lorilee
3ba5c8e0f4 Fixed XHTML syntax problems 2010-06-18 16:11:52 -04:00
lorilee
b43cea6007 Modified label text and formatting 2010-06-11 01:26:35 -04:00
lorilee
fde6380f0c Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-11 01:26:34 -04:00
lorilee
5eb6321e4e Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-11 01:26:34 -04:00
lorilee
83a7e12283 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-11 01:26:34 -04:00
lorilee
140007579f Updated hidden structure/data field name, Modified label text 2010-06-11 01:26:34 -04:00