Commit Graph

96310 Commits

Author SHA1 Message Date
Madhura Jayaratne
038ed2dc04 Update jquery-ui-timepicker-addon to version 1.5.0
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 18:01:02 +05:30
Madhura Jayaratne
eac0b0ff79 Update ba-hashchange for jquery 1.9+ since there are no new releases of ba-hashchange
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 17:52:58 +05:30
Madhura Jayaratne
4b44c3fdf7 Update mousewheel plugin to version 3.1.12
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 17:27:04 +05:30
Madhura Jayaratne
244021ada8 Update tablesorter for jquery 1.9+ since there are no new releases of tablesorter
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 17:03:40 +05:30
Madhura Jayaratne
1dbb5d7b82 Update jquery.svg to version 1.5.0
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 16:45:02 +05:30
Madhura Jayaratne
df1b1971dc Update jqplot to version 1.0.8
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 15:55:35 +05:30
Madhura Jayaratne
60079cd297 As of 1.9, the event name string "hover" is no longer supported as a synonym for "mouseenter mouseleave"
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 12:23:06 +05:30
Madhura Jayaratne
096c5d4ac0 Use .prop() in place of .attr() in appropriate places
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 11:39:45 +05:30
Madhura Jayaratne
b7696eb558 .addBack( selector ) replaces .andSelf()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 10:38:44 +05:30
Madhura Jayaratne
903c481242 Fix typo
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 10:31:12 +05:30
Madhura Jayaratne
83773a4992 _removeErrorNotification() function is also called manually without an event
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-04 10:29:18 +05:30
Madhura Jayaratne
d03c3adff4 More instances of .live() and .die() replaced with .on() and .off()
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 18:07:58 +05:30
Madhura Jayaratne
410d1c32df .live() and .die() methods are deprecated. Use .on() and .off() methods instead
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 17:07:46 +05:30
Madhura Jayaratne
bd02f91a2a Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 13:26:53 +05:30
Madhura Jayaratne
58df5ebed5 bug #4616 Warning in db structure print view page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 13:17:54 +05:30
Weblate
e49d35ae65 Merge remote-tracking branch 'origin/master' 2014-12-02 08:19:46 +01:00
Domen
66aed1e896 Translated using Weblate (Slovenian)
Currently translated at 99.8% (2986 of 2991 strings)

[CI skip]
2014-12-02 08:19:44 +01:00
Madhura Jayaratne
7e01f79fee ID is no longer used to facilitate multiple result sets
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 12:49:27 +05:30
Madhura Jayaratne
8fcf249a28 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 12:26:57 +05:30
Weblate
26895da3c9 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-02 07:55:27 +01:00
Domen
57646991df Translated using Weblate (Slovenian)
Currently translated at 99.8% (2974 of 2978 strings)

[CI skip]
2014-12-02 07:55:25 +01:00
Jan Erik Zassenhaus
43d044e5ee Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-02 07:55:23 +01:00
Madhura Jayaratne
5d0a2298e2 bug #4615 SQL highlighting in process list breaks on auto refresh
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-02 12:25:05 +05:30
Hugues Peccatte
803df26c75 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-12-01 21:19:35 +01:00
Hugues Peccatte
c2d516cac4 Remove unused variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-01 21:19:13 +01:00
Weblate
07b01001f1 Merge remote-tracking branch 'origin/master' 2014-12-01 19:37:42 +01:00
Jan Erik Zassenhaus
d0470dfea3 Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-01 19:37:39 +01:00
Marc Delisle
918b089a37 Return statement not possible here
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-01 13:37:18 -05:00
Marc Delisle
e61dc35ba3 Merge branch 'QA_4_3' 2014-12-01 10:31:32 -05:00
Weblate
e09ff83c33 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-01 16:31:21 +01:00
Michal Čihař
7662bf11ef Translated using Weblate (Czech)
Currently translated at 94.7% (2822 of 2978 strings)

[CI skip]
2014-12-01 16:31:19 +01:00
Marc Delisle
a117cb2552 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-01 10:31:02 -05:00
Nisarg Jhaveri
c43d60d1a4 Bug 4614 Missing separator
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-01 10:30:06 -05:00
Madhura Jayaratne
3d8a6c3bb4 Use placeholder to save horizontal space
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 18:34:50 +05:30
Madhura Jayaratne
5fd35f82e0 Make Structure tab active for table relations page as well
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 18:31:10 +05:30
Madhura Jayaratne
580cd73da4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-01 18:20:23 +05:30
Madhura Jayaratne
5a2d5b26a8 login-link is no longer used since automatic redirection is used
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 18:13:54 +05:30
Weblate
f6846bf750 Merge remote-tracking branch 'origin/master' 2014-12-01 13:40:02 +01:00
Michal Čihař
3c457a3e80 Translated using Weblate (Czech)
Currently translated at 94.3% (2822 of 2991 strings)

[CI skip]
2014-12-01 13:39:59 +01:00
Madhura Jayaratne
d12158eb83 Merge pull request #1409 from madhuracj/multiquery
Multiquery
2014-12-01 18:09:54 +05:30
Madhura Jayaratne
395c718075 Move more JS code to tbl_operations.js
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 18:03:01 +05:30
Madhura Jayaratne
c099f04bc6 Move drop database handling code to db_operations.js
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 17:55:51 +05:30
Madhura Jayaratne
f6c98b70cb Move JavaScript related to table operations page to a js file of its own
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 17:43:19 +05:30
Madhura Jayaratne
f9e430e0d3 Merge branch 'master' into multiquery 2014-12-01 16:51:48 +05:30
Madhura Jayaratne
8d9054f732 Use class attribute to select result_query div
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 16:49:17 +05:30
Michal Čihař
b7e17814c1 Fix variable name
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 11:59:07 +01:00
Michal Čihař
2502375982 Add missing call to test
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 11:56:19 +01:00
Michal Čihař
a6764bab9b Always restore mocked instance after test
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-12-01 11:38:40 +01:00
Madhura Jayaratne
8c215b4a84 Do no use ID attributes for bookmark fields
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 15:54:08 +05:30
Madhura Jayaratne
f2782eb957 Remove table_results ID field
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 15:25:22 +05:30