Commit graph

12393 commits

Author SHA1 Message Date
Sam
22fbae8556 Merge pull request #2674 from akshaymohite/optimization-fixes
renamed unused variables properly
2014-09-02 08:22:43 +10:00
Sam
e0c8abc911 Merge pull request #2717 from riking/badge-solid
Admin badge interface improvements
2014-09-02 08:21:06 +10:00
Sam
202656a679 Merge pull request #2725 from cpradio/german-keyboard-support
FIX: Support J/K bindings on German Keyboards
2014-09-02 08:02:10 +10:00
Sam
208dd7848d Merge pull request #2736 from cpradio/fix-duplicate-badge-titles
FIX: Duplicate badge titles can still occur
2014-09-02 06:52:09 +10:00
cpradio
02a7a579f4 FIX: Duplicate badge titles can still occur
Send false instead of true to .uniq as the badges are not sorted.
https://meta.discourse.org/t/set-title-dialog-shows-multiple-instances-of-the-same-badge-2/19495
2014-09-01 13:56:19 -04:00
Jeff Atwood
03a7b01e4b Merge pull request #2735 from techAPJ/patch-3
suppress post count on avatar for single post
2014-09-01 08:11:32 -07:00
Arpit Jalan
eba3f6b408 suppress post count on avatar for single post 2014-09-01 14:23:34 +05:30
Sam
68cc4fb285 we need more height 2014-09-01 17:42:27 +10:00
Sam
60559b42be got to move inidicator a bit 2014-09-01 17:17:50 +10:00
Sam
12f417a378 fix broken spec 2014-09-01 17:07:09 +10:00
Sam
69e418facf FEATURE: wider search with more context 2014-09-01 17:04:57 +10:00
Jeff Atwood
7ef056810c minor copy update 2014-08-31 23:32:41 -07:00
riking
808460a28f Fix magic numbers, extra param references 2014-08-31 19:36:31 -07:00
cpradio
42c052d21b FIX: Readd the dismiss keybindings
https://meta.discourse.org/t/new-updated-bar-and-dismiss-new-button-unreachable-by-keyboard/18946/10?u=cpradio
2014-08-31 21:56:38 -04:00
cpradio
6234284243 FIX: Remove the old keyboard bindings for next/prev section, update client.en.yml to reflect the new bindings 2014-08-31 21:42:03 -04:00
Sam
f5f0971286 Merge pull request #2732 from gschlager/fix01
FIX: Reset changed site settings after import is complete
2014-09-01 11:20:31 +10:00
Sam
a2d4347573 Merge pull request #2733 from kamilbielawski/destroy_category_group_when_category_is_destroyed
FIX: destroy CategoryGroup when Category or Group is destroyed
2014-09-01 11:19:03 +10:00
Kamil Bielawski
bf679f1626 FIX: destroy CategoryGroup when Category or Group is destroyed 2014-08-31 22:10:38 +02:00
riking
1833b43ae2 FEATURE: Badge query validation, preview results, and EXPLAIN
Upon saving a badge or requesting a badge result preview,
BadgeGranter.contract_checks! will examine the provided badge SQL for
some contractual obligations - namely, the returned columns and use of
trigger parameters.

Saving the badge is wrapped in a transaction to make this easier, by
raising ActiveRecord::Rollback on a detected violation.

On the client, a modal view is added for the badge query sample run
results, named admin-badge-preview.
The preview action is moved up to the route.
The save action, on failure, triggers a 'saveError' action (also in the
route).

The preview action gains a new parameter, 'explain', which will give the
output of an EXPLAIN query for the badge sql, which can be used by forum
admins to estimate the cost of their badge queries.
The preview link is replaced by two links, one which omits (false) and
includes (true) the EXPLAIN query.

The Badge.save() method is amended to propogate errors.

Badge::Trigger gets some utility methods for use in the
BadgeGranter.contract_checks! method.

Additionally, extra checks outside of BadgeGranter.contract_checks! are
added in the preview() method, to cover cases of null granted_at
columns.

An uninitialized variable path is removed in the backfill() method.

TODO - it would be nice to be able to get the actual names of all
columns the provided query returns, so we could give more errors
2014-08-31 11:25:44 -07:00
Gerhard Schlager
5a769c7c48 FIX: Reset changed site settings after import is complete
After an import has finished the site settings should be reset to their
previous values. For example, since 'disable_emails' was set to false
before any import, it wasn't possible to login after the import
(sending email for password reset didn't work).
2014-08-31 18:09:21 +02:00
Sam
5c244c6f8f FIX: autocomplete username failing to pop up
Janky autocomplete behavior due to debounce not being accounted for
correctly when dealing with promises

This also fixes a promise leak
2014-09-01 01:48:17 +10:00
Jeff Atwood
9aac004c0a minor copy update, Omit Needless Words 2014-08-31 04:47:27 -07:00
Jeff Atwood
6221a84ce8 minor copy updates 2014-08-31 04:46:20 -07:00
Jeff Atwood
bdd3dd8a5b add 1GB memory change notes 2014-08-31 01:13:20 -07:00
Jens Maier
9be5c98c8c FIX: Markdown parser: empty links and bbcode parsed as link refs 2014-08-31 02:55:43 +02:00
Jeff Atwood
6d1be665a1 Merge pull request #2729 from cpradio/firefox-kbd-post-navigation
FIX: j/k navigation for posts using Firefox
2014-08-30 13:32:15 -07:00
Jeff Atwood
a0e47dae63 Merge pull request #2728 from techAPJ/patch-3
UX: add line break before time for post navigator
2014-08-30 13:26:28 -07:00
cpradio
37639308c0 FIX: Firefox j/k post navigation is inconsistent
https://meta.discourse.org/t/j-k-navigation-in-lengthy-topics/18945
2014-08-30 08:59:08 -04:00
cpradio
4aec030cb6 Merge branch 'master' of http://github.com/discourse/discourse 2014-08-30 08:20:57 -04:00
cpradio
3f5d530553 Change SHIFT+J and SHIFT+K to move up/down sections instead of posts. 2014-08-30 07:31:38 -04:00
Arpit Jalan
82d4c29c88 TRIVIAL: add line break before time for post navigator 2014-08-30 16:14:00 +05:30
Jeff Atwood
fb33081c36 Merge pull request #2727 from techAPJ/patch-4
FIX: use short date format for topic summary
2014-08-29 23:41:16 -07:00
Arpit Jalan
289d9e4fe1 FIX: use short date format for topic summary 2014-08-30 12:07:43 +05:30
Jeff Atwood
7a50ba600a Merge pull request #2726 from techAPJ/patch-4
FIX: use short date format for post navigator
2014-08-29 23:11:31 -07:00
Arpit Jalan
3c005557e6 FIX: use short date format for post navigator 2014-08-30 11:34:33 +05:30
Jeff Atwood
70dbad16dc UX: simplify copy for summarize topic mode 2014-08-29 22:59:39 -07:00
Jeff Atwood
4281b16616 UX: dim the new and unread education 2014-08-29 22:54:11 -07:00
Jeff Atwood
d7e4a19f3a Merge pull request #2723 from cpradio/keyboard-binding-incoming-updated-topics
UX: Keyboard binding incoming/updated topics
2014-08-29 19:33:40 -07:00
cpradio
89eb03aff0 FIX: Support J/K bindings on German Keyboards
J/K are not supported on German keyboards, shift+j and shift+k have been added to remedy this.
https://meta.discourse.org/t/keyboard-shortcuts-for-next-previous-section-do-not-work-with-german-keyboard-layout/18902
2014-08-29 22:18:03 -04:00
cpradio
3853fb1367 Merge branch 'master' of http://github.com/discourse/discourse 2014-08-29 21:24:56 -04:00
cpradio
8b349b43a5 UX: Add keyboard binding for reply as new topic
Removed extra translation in the keyboard shortcut modal window
2014-08-29 20:10:34 -04:00
Jeff Atwood
111b35f613 UX: rename "Leader" to "Veteran" (more) 2014-08-29 17:09:54 -07:00
cpradio
2e200ffbf0 Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics
Conflicts:
	config/locales/client.en.yml
2014-08-29 20:05:59 -04:00
cpradio
875b39fb5f Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics 2014-08-29 19:56:39 -04:00
cpradio
d2dea54c88 Merge remote-tracking branch 'cpradio/keyboard-binding-incoming-updated-topics'
Conflicts:
	config/locales/client.en.yml
2014-08-29 19:53:54 -04:00
Jeff Atwood
cb45d5fa25 Merge pull request #2724 from cpradio/key-binding-reply-new-topic
UX: Add keyboard binding for reply as new topic
2014-08-29 16:46:34 -07:00
Jeff Atwood
d74f94afa1 Merge pull request #2722 from cpradio/dismiss-keyboard-bindings
UX: Add key-bindings for Dismiss New, Dismiss Posts, and Dismiss Topics
2014-08-29 16:28:25 -07:00
cpradio
68e807f791 UX: Add keyboard binding for reply as new topic 2014-08-29 19:14:42 -04:00
Sam
68a3fd5ef0 FIX: developer emails not working on ruby 2.0 2014-08-30 09:07:30 +10:00
Jeff Atwood
0eb367f9c3 UX: rename "Leader" to "Veteran" (first steps) 2014-08-29 15:57:13 -07:00