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

96162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
f6f09ceaf9 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 08:30:09 -05:00
Madhura Jayaratne
f9272e7c4b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-26 18:53:23 +05:30
Madhura Jayaratne
ad2de53286 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:52:08 +05:30
Marc Delisle
1097e52ee0 Merge branch 'QA_4_3' 2014-11-26 08:12:46 -05:00
Marc Delisle
e38f5753ff Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 08:12:23 -05:00
Madhura Jayaratne
7332dbbdc0 Remove more duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:34:06 +05:30
Madhura Jayaratne
469d6311c5 Remove duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:23:08 +05:30
Marc Delisle
9e9d9c08c7 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 07:46:06 -05:00
Marc Delisle
6f8a253daf Merge pull request #1407 from madhuracj/tokenMismatch 
Workaround for token mismatch error on server session timeout for config and http authentication types
 2014-11-26 07:42:46 -05:00
Madhura Jayaratne
8807575586 Merge branch 'tracking' 2014-11-26 18:08:55 +05:30
Madhura Jayaratne
9bf8246139 Improve action message 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:01:14 +05:30
Madhura Jayaratne
80c0ba810a Allow deleting individual versions of tracking data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 17:57:33 +05:30
Madhura Jayaratne
805352c1fd Add @return doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 16:25:18 +05:30
Madhura Jayaratne
5cd85cf5fd Database column is redundant 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 16:24:03 +05:30
Madhura Jayaratne
d9c3b9cbed rfe #1564 Improve action message on Tracking page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 16:08:26 +05:30
Madhura Jayaratne
1206bcedd7 This is no longer required 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 15:43:06 +05:30
Madhura Jayaratne
10f57c9af6 Use $sql_query as $GLOBALS. There is no point passing them back and forth. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 14:04:03 +05:30
Madhura Jayaratne
186ff1ee79 Simplify the condition 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 13:34:06 +05:30
Madhura Jayaratne
5f646285dc This method is redundant 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 13:30:29 +05:30
Madhura Jayaratne
bf175e00bb Merge branch 'QA_4_3' 2014-11-26 12:59:40 +05:30
Madhura Jayaratne
f5c263119d Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 12:44:09 +05:30
Madhura Jayaratne
9a818c289d bug #4607 Syntax error during db_copy operation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 12:39:09 +05:30
Madhura Jayaratne
090c10cccf Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 09:39:16 +05:30
Madhura Jayaratne
5e3a4451e6 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 08:41:33 +05:30
Marc Delisle
9ca5ea653a Merge pull request #1408 from madhuracj/tracking 
Tracking improvements. Implements rfe #1562
 2014-11-25 12:46:56 -05:00
Marc Delisle
acb40ebd16 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-25 12:24:03 -05:00
Madhura Jayaratne
70f432f7af Warn when no tables have been selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 17:50:26 +05:30
Madhura Jayaratne
3b2f62d3c2 Tracking improvements. Implements rfe #1562 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 17:31:53 +05:30
Madhura Jayaratne
cca5f55a4d Do not advertise on every table level page that tracking is active 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:47:38 +05:30
Madhura Jayaratne
6b71a1130f Merge branch 'QA_4_3' 2014-11-25 10:28:38 +05:30
Madhura Jayaratne
57413772c1 Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:26:09 +05:30
Madhura Jayaratne
14a77261d2 bug #4606 Tracking report export as SQL dump does not work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 10:21:18 +05:30
Madhura Jayaratne
e1ca65b49e Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 09:29:39 +05:30
Weblate
e2a9605706 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-25 04:45:46 +01:00
Huseyn
762dd0884f Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1582 of 2978 strings)

[CI skip]
 2014-11-25 04:45:45 +01:00
Madhura Jayaratne
0fda8293f4 Merge branch 'QA_4_2' into QA_4_3 2014-11-25 09:15:08 +05:30
Madhura Jayaratne
8607de61e0 bug #4605 Unseen messages in tracking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-25 09:01:35 +05:30
Weblate
2324b74d57 Merge remote-tracking branch 'origin/master' 2014-11-24 16:27:54 +01:00
Huseyn
c4db3fd497 Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1582 of 2976 strings)

[CI skip]
 2014-11-24 16:27:51 +01:00
Marc Delisle
6a442d969c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-24 10:27:38 -05:00
Marc Delisle
51f2efc9e1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-24 09:50:17 -05:00
Sevdimali İsa
aad6456b45 Translated using Weblate (Azerbaijani) 
Currently translated at 53.0% (1581 of 2978 strings)

[CI skip]
 2014-11-24 14:57:41 +01:00
Sevdimali İsa
6aed90e19d Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1581 of 2976 strings)

[CI skip]
 2014-11-24 14:57:37 +01:00
Hugues Peccatte
293399745f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-23 15:45:25 +01:00
Marc Delisle
6ccd694f6b Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-23 07:42:54 -05:00
Marc Delisle
c53f5f7c7c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-23 07:08:55 -05:00
Weblate
980b0c0d62 Merge remote-tracking branch 'origin/master' 2014-11-23 12:17:03 +01:00
Sevdimali İsa
c012724473 Translated using Weblate (Azerbaijani) 
Currently translated at 53.0% (1579 of 2976 strings)

[CI skip]
 2014-11-23 12:17:00 +01:00
Marc Delisle
b38970d4ac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-23 06:15:51 -05:00
Hugues Peccatte
f0b18d5028 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-22 22:36:31 +01:00