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

96187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ann + J.M
93af3b758e Translated using Weblate (German) 
Currently translated at 99.9% (2976 of 2978 strings)

[CI skip]
 2014-11-27 15:57:29 +01:00
Marc Delisle
aeebf1052f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-27 09:54:16 -05:00
Dieter Adriaenssens
f99176f5ff Translated using Weblate (Dutch) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-11-27 15:39:42 +01:00
Madhura Jayaratne
e528721543 Show messages for mulitquery 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:26:37 +05:30
Madhura Jayaratne
591fde9ed7 No longer need special handling since we are using the same div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:30:10 +05:30
Madhura Jayaratne
36693cf6c3 Use the same div to show message when no rows are returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:27:18 +05:30
Madhura Jayaratne
47fdaea07d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-27 15:07:48 +05:30
Madhura Jayaratne
dfd10b34fe Serve both ajax and non-ajax scenarios 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 15:06:14 +05:30
Kristjan Räts
90eda81d9c Translated using Weblate (Estonian) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-11-27 08:53:56 +01:00
Weblate
6756460d35 Merge remote-tracking branch 'origin/master' 2014-11-27 06:06:39 +01:00
Marcos Algeri
5f9a8cfe3c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2801 of 2991 strings)

[CI skip]
 2014-11-27 06:06:36 +01:00
Giovanni Sora
0c41d54852 Translated using Weblate (Interlingua) 
Currently translated at 63.8% (1911 of 2991 strings)

[CI skip]
 2014-11-27 06:06:35 +01:00
Aputsiaq Niels Janussen
870bc24215 Translated using Weblate (Danish) 
Currently translated at 96.8% (2896 of 2991 strings)

[CI skip]
 2014-11-27 06:06:33 +01:00
Madhura Jayaratne
6fb9a53b4a Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 10:34:44 +05:30
Madhura Jayaratne
10b958c1ba Merge branch 'QA_4_2' into QA_4_3 2014-11-27 10:27:34 +05:30
Madhura Jayaratne
19802ca9f9 bug #4608 SELECT permission issues with relations and restricted access 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 10:25:42 +05:30
Danilo GUia
e08383ba25 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.9% (2797 of 2978 strings)

[CI skip]
 2014-11-26 18:32:25 +01:00
Weblate
bf4a032384 Merge remote-tracking branch 'origin/master' 2014-11-26 17:22:04 +01:00
Jan Erik Zassenhaus
0a5ded4223 Translated using Weblate (German) 
Currently translated at 99.8% (2974 of 2978 strings)

[CI skip]
 2014-11-26 17:22:02 +01:00
Marc Delisle
8c16aa8a3d 4.3.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 11:21:52 -05:00
Marc Delisle
d4ffed8ea4 Merge commit '4966026' 2014-11-26 11:21:31 -05:00
Weblate
ee22c7efa2 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-11-26 17:21:10 +01:00
Jan Erik Zassenhaus
0446f3c294 Translated using Weblate (German) 
Currently translated at 99.8% (2974 of 2978 strings)

[CI skip]
 2014-11-26 17:21:08 +01:00
Marc Delisle
496602674c 4.3.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 11:20:54 -05:00
Burak Yavuz
eed0ffa96b Translated using Weblate (Turkish) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-11-26 15:05:47 +01:00
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