Commit Graph

10908 Commits

Author SHA1 Message Date
Sam
97c44469fe Update emoji.js.erb
bump version
2014-09-10 17:30:20 +10:00
Sam
91dcc56fb3 Revert "PERF: avoid OR in complex query"
This reverts commit a8dc6daa38.
2014-09-10 17:10:57 +10:00
Jeff Atwood
126dfa0ec7 remove hover border for reply as new topic 2014-09-10 00:09:35 -07:00
Jeff Atwood
e5de31bbed proper switch to emojione for emojis 2014-09-09 23:59:34 -07:00
Sam
03df9a80ea revert emoji change 2014-09-10 16:50:58 +10:00
Jeff Atwood
e6c0d42f95 fix up missing emojis due to name mappings 2014-09-09 23:39:49 -07:00
Sam
a8dc6daa38 PERF: avoid OR in complex query
10x perf improvement on front page for sitepoint
2014-09-10 16:33:39 +10:00
Sam
b9c8ae588a minor refactor 2014-09-10 16:33:39 +10:00
Jeff Atwood
c1f19ac74a update to emojione
http://github.com/ranks/emojione
2014-09-09 23:02:00 -07:00
Sam
ca5705d3a3 Merge pull request #2777 from riking/all-notifications
Switch to count of all notifications
2014-09-10 13:14:53 +10:00
riking
637371e60a Switch to count of all notifications 2014-09-09 20:13:36 -07:00
Jeff Atwood
5dfd3fc8eb Merge pull request #2776 from cpradio/add-reset-password-instructions
UX: Add password instructions to Reset Password page
2014-09-09 18:42:52 -07:00
cpradio
3bd0c94d96 UX: Add password instructions to Reset Password page
Added the password instructions to the reset password page.
https://meta.discourse.org/t/reset-password-doesnt-give-password-requirements/19799
2014-09-09 20:37:39 -04:00
Sam
b2fe6f6cb2 Merge pull request #2775 from riking/notification-hotfix
FIX: Broken notification history
2014-09-10 10:26:31 +10:00
riking
bf06878601 FIX: Broken notification history 2014-09-09 17:25:25 -07:00
Sam
51d9a59d53 copy, "notification history" is just too long 2014-09-10 10:14:42 +10:00
Sam
8c02f47f23 Merge pull request #2760 from riking/email-on-wrote
Add "On DATE, Name wrote:" email trimming trigger
2014-09-10 09:48:30 +10:00
Sam
489fc93a98 Merge pull request #2743 from riking/notification-history
FEATURE: Actually show more notifications
2014-09-10 09:48:02 +10:00
Sam
c61642fe00 FEATURE: better wikipedia oneboxes (support sections)
FEATURE: better twitter oneboxes (expand links)

update onebox gem
2014-09-10 09:39:33 +10:00
riking
5994b630b7 Final dirty diff cleanup 2014-09-09 16:29:08 -07:00
riking
69bc552054 FEATURE: Actually show more notifications
The "Show more notifications..." link in the notifications dropdown now
links to /my/notifications, which is a historical view of all
notifications you have recieved.

Notification history is loaded in blocks of 60 at a time.

Admins can see others' notification history. (This was requested for
'debugging purposes', though that's what impersonation is for, IMO.)
2014-09-09 16:29:08 -07:00
riking
c1df25e856 Add test for "on day, name wrote" quote trigger 2014-09-09 16:27:06 -07:00
riking
a0dccf7bc0 FIX: Add "On day, name wrote:" quote trigger for emails 2014-09-09 16:27:06 -07:00
Sam
a5e98c9906 Merge pull request #2753 from mcwumbly/span-excerpt2
FEATURE: Allow manual excerpt to be specified anywhere in the post and override max excerpt length
2014-09-10 09:14:05 +10:00
Sam
5001e826ff Merge pull request #2756 from cpradio/add-go-to-top-shortcut
UX: Add g, t keyboard shortcut to modal window for go to top
2014-09-10 09:11:16 +10:00
Sam
4edbb5b98c Merge pull request #2773 from riking/post-handlebars
(Trivial) Handlebars structure tweaks to post.handlebars
2014-09-10 09:04:12 +10:00
Jeff Atwood
d8f66a3eee asset warning on anon download prevention setting 2014-09-09 15:33:15 -07:00
Jeff Atwood
1ef48f6af3 clarify copy on disable_edit_notifications 2014-09-09 15:17:48 -07:00
Robin Ward
2d32325ac7 FIX: Show user expansion on user stream too 2014-09-09 17:55:55 -04:00
Neil Lalonde
d07421d45b Version bump to v1.1.0.beta1 2014-09-09 17:35:51 -04:00
Neil Lalonde
19cba7bb0f Version checks include the branch 2014-09-09 17:35:51 -04:00
Jeff Atwood
b2460d7395 improve test email copy 2014-09-09 14:29:41 -07:00
Robin Ward
62c9e4228d Rename {{icon}} helper to {{fa-icon}} for future Ember
compatibility.
2014-09-09 17:29:05 -04:00
Robin Ward
cec6b64a45 FIX: Don't show filter on user card if not in topic 2014-09-09 16:53:43 -04:00
Robin Ward
a09ff29dd9 UX: Only intercept Cmd-F/Ctrl-F for search on a topic when not all posts
are available in the DOM.
2014-09-09 16:05:17 -04:00
Robin Ward
504d61de94 FIX: Clicking on expanded user actions uses user expansion. Also added
integration test.
2014-09-09 15:18:04 -04:00
Jeff Atwood
bcfd2778d7 Merge pull request #2774 from awesomerobot/master
changing the header now that fullname was dropped
2014-09-09 11:52:50 -07:00
Kris Aubuchon
ebe71ea491 changing the header now that fullname was dropped 2014-09-09 14:42:44 -04:00
Régis Hanol
79030c874e FIX: allow staff members to restore withdrawn posts that are flagged 2014-09-09 20:26:40 +02:00
riking
7bb1b8bc97 Handlebars structure tweaks to post.handlebars
- Combine bind-attrs on the <article> (seriously that made no sense)
 - Hoist a bind-attr class to the view, allowing more fancy styling
 - Hoist a <div> outside a conditional
 - Change href='#' to unvalued hrefs
2014-09-09 11:20:25 -07:00
Régis Hanol
c9dea9ce5c TRIVIAL: improve display of the rebake task 2014-09-09 19:25:20 +02:00
Robin Ward
d7621267f4 Merge pull request #2768 from gschlager/i18n_fix06
UX: Filter for "Reply key" was not translatable in Transifex
2014-09-09 13:18:13 -04:00
Régis Hanol
d4d6ff8e45 Merge pull request #2772 from mkayman/s3_store_content_disposition
Don't set content-disposition header for images
2014-09-09 19:12:09 +02:00
Robin Ward
8b33e659a1 FIX: Only use cached topic lists on popState 2014-09-09 12:57:51 -04:00
Robin Ward
a96ba8ed78 Revert "FIX: unread/new counts out of sync with tabs"
This reverts commit c093187d34.
2014-09-09 12:57:51 -04:00
Régis Hanol
598a3f3e10 FIX: 'disable_edit_notifications' will only disable revisions made by the system user 2014-09-09 18:56:04 +02:00
Mesut Kayman
80468037e9 Don't set content-disposition header for images
If this header is set for images, clicking the image link causes them to automatically download the file, rather than viewing it inside the browser. This commit forces this behavior only for uploads that aren't images
2014-09-09 19:43:02 +03:00
Régis Hanol
eb34ecfc0c FEATURE: new 'prevent anons from download files' site setting 2014-09-09 18:41:13 +02:00
Jeff Atwood
0ee386c7f4 simplify notification level copy a bit 2014-09-09 09:36:30 -07:00
Régis Hanol
7f498a8795 FIX: N+1 query on /categories page 2014-09-09 15:32:58 +02:00