gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,288 Commits 12 Branches 481 Tags 2.4 GiB
8fa9f576fd
Commit Graph

831 Commits

Author SHA1 Message Date
Marc Delisle
1347aa60e3 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-21 09:16:50 -04:00
Marc Delisle
ea2dd3c171 bug #4361 Can't change font size (when config.inc.php not present) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-21 09:13:18 -04:00
Chanaka Dharmarathna
31da8b1cdc Remove unsed variable 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:21:10 +05:30
Chanaka Dharmarathna
08e8ab1cda Remove unused parameter 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-17 00:04:01 +05:30
Chanaka Dharmarathna
866a62800d Remove unused variable in _getPlacedLinks() function 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-09-15 22:25:25 +05:30
Hugues Peccatte
ebda4090db Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-14 15:47:14 +02:00
Marc Delisle
c8b4217e42 Fix tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:54:46 -04:00
Marc Delisle
fde42eb2e8 No need to have a distinct file 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-06 14:11:04 -04:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Hugues Peccatte
4960f208e2 Add PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-30 21:14:30 +02:00
Marc Delisle
e3fb12e385 Merge commit '3b479f5' 2014-08-28 15:43:36 -04:00
Smita Kumari
3b479f52f9 fix unit test 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 22:48:35 +05:30
Madhura Jayaratne
a908121b59 Fix more failing tests 2014-08-24 21:56:35 +05:30
Madhura Jayaratne
c33374e243 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 21:31:05 +05:30
Madhura Jayaratne
681bca3560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-24 07:36:53 +05:30
Madhura Jayaratne
e5f1c6d8bf Simplify schema exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 07:36:10 +05:30
Marc Delisle
551099bc93 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-23 07:34:11 -04:00
Marc Delisle
f7f39347ef Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-22 12:45:41 -04:00
Marc Delisle
f8634bb1bb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 08:44:40 -04:00
Marc Delisle
59d660d30d Unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-16 08:40:28 -04:00
Marc Delisle
7be74bf634 Merge pull request #1334 from nisargjhaveri/feature_857 
feature 857: Regex search and replace
 2014-08-16 07:30:29 -04:00
Nisarg Jhaveri
169e15be81 feature 857: Regex search and replace 
- Implemented basic regex search and replace for tables.
- Added a checkbox to use regex in 'Find and Replace' view.
- Fixed some tests for this feature

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@students.iiit.ac.in>
 2014-08-15 18:26:31 +05:30
Marc Delisle
8537e1d966 Merge commit '5681db5' 2014-08-14 12:08:12 -04:00
Smita Kumari
5681db5084 fix bug #4516 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-14 20:55:02 +05:30
Ashutosh Dhundhara
9191c1aa4e Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-11 03:58:19 +05:30
Bimal Yashodha
b2f80eb97a Merge branch 'master' into designer 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 08:57:43 +05:30
Hugues Peccatte
8558047094 Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-09 23:21:13 +02:00
Hugues Peccatte
30e0dc70cc Coding style modifications. 
Remove unused variables.
PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-09 23:11:36 +02:00
Bimal Yashodha
268a1a05e4 Fix failing tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 01:31:05 +05:30
Bimal Yashodha
a32465f398 Update tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 00:16:57 +05:30
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Madhura Jayaratne
a34b6fea5a Merge pull request #1283 from kb-yashodha/indexdb 
IndexDB for designer - Use the designer without configuring tables
 2014-07-26 10:08:32 +05:30
Chirayu Chiripal
871ad6d8ab update transformation path in getInfo method 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-24 14:14:03 +05:30
Bimal Yashodha
00ec108407 Resolve tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-23 16:46:59 +05:30
Chirayu Chiripal
43c289ab56 Combined transformation plugins test to avoid duplication issues 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-13 17:46:22 +05:30
Marc Delisle
56659dfa8c Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-13 07:58:43 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Marc Delisle
9403921e4e Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-06 06:58:20 -04:00
Bimal Yashodha
adf0d2e4b7 Remove old relational schema edit/export page and related code 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-07-01 17:51:45 +05:30
Michal Čihař
6be21dcb47 Merge pull request #1251 from WhaleWatching/console 
PMA console, history and bookmarks.
 2014-06-25 15:37:29 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00
Michal Čihař
74e499a3d2 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-25 09:25:02 +02:00
Chirayu Chiripal
48b0bfd259 no need to disable contructor of SplObjectStorage 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 09:24:19 +02:00
Chirayu Chiripal
32511719b1 RFE-1490 Dynamic process list 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-24 19:13:21 +05:30
Michal Čihař
e5b9e500c9 Correct value for a parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-24 09:51:14 +02:00
Michal Čihař
05820648e2 Revert "Fix failing tests" 
This reverts commit 1fd8fde4ca.
 2014-06-24 09:35:35 +02:00
Michal Čihař
93993c3b88 Merge commit '8b5ea8869db0c576b1c2f69c36935b010faeb972' 
Conflicts:
	ChangeLog
	libraries/Table.class.php
 2014-06-24 08:48:00 +02:00
Ann + J.M
1fd8fde4ca Fix failing tests 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:49:17 +02:00
Chirayu Chiripal
a78a7a0c9c export with table/column names changes extended for other export formats 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-18 16:09:57 +05:30