Commit graph

17651 commits

Author SHA1 Message Date
Robin Ward
d1ebb9d0b5 FIX: I18n Fallbacks were not applying correctly 2015-12-23 12:09:18 -05:00
Arpit Jalan
47410f1b99 Update Translations 2015-12-23 17:01:43 +05:30
Sam
03ea0bfe22 FEATURE: allow users to archive messages
Messages are now in 3 buckets

- Inbox for all new messages
- Sent for all sent messages
- Archive for all messages you are done with

You can select messages from your Inbox or Sent and move them to your Archive,
you can move messages out of your Archive similarly

Similar concept applied to group messages, except that archiving and unarchiving
will apply to all group members
2015-12-23 11:09:30 +11:00
Jeff Atwood
e03861da7e change all emoji image tests to use ?v=1 2015-12-22 14:36:21 -08:00
Neil Lalonde
95749fdeb7 Merge pull request #3929 from techAPJ/tl4
FEATURE: make "trust level 3" requirements time period admin setting
2015-12-22 17:04:19 -05:00
Sam
205b1c5fbd Update emoji.js.erb
bump emoji number
2015-12-23 08:46:42 +11:00
Robin Ward
67c08e8aae FIX: Broken tests for slightly_smiling 2015-12-22 16:07:28 -05:00
Jeff Atwood
8d88bf165f zopflipng on emoji one images 2015-12-22 13:04:39 -08:00
Robin Ward
78916ea896 FIX: Transparent background for emoji one slightly_smiling 2015-12-22 15:32:52 -05:00
Robin Ward
b9d276dc76 Use proper slightly_smiling in emoji one and twitter sets 2015-12-22 15:29:20 -05:00
Robin Ward
3095dd160e Add slightly_smiling emoji and use it as default smile. 2015-12-22 14:40:49 -05:00
Robin Ward
faaafe2163 Update emoji one 2015-12-22 13:44:06 -05:00
Arpit Jalan
f40249faad FEATURE: make trust level 3 time period admin setting 2015-12-22 23:26:19 +05:30
Sam Saffron
00342faff9 FIX: use default favicon if a bad favicon is specified 2015-12-22 18:08:27 +11:00
Arpit Jalan
c87fff670d add category list label and state 2015-12-21 23:07:16 +05:30
Régis Hanol
3e923c7a41 FIX: ensure inactive users can't email in 2015-12-21 17:54:02 +01:00
Neil Lalonde
b3198d7a6a callback in TopicQuery for plugins to add result set filters 2015-12-21 11:43:17 -05:00
Régis Hanol
a9099f9e23 SECURITY: ensure we never accept fake images 2015-12-21 16:08:14 +01:00
Jamie Nguyen
eed86e9afc Do not log favicon.ico requests 2015-12-21 12:14:36 +00:00
Jamie Nguyen
e8919df110 Return 204 instead of 404 for favicon.ico requests 2015-12-21 12:13:56 +00:00
Arpit Jalan
727fd727ea UX: properly parse activity column 2015-12-21 16:52:19 +05:30
Jeff Atwood
33669f97e4 remove blue from "similar to" topic excerpts 2015-12-21 01:12:03 -08:00
Jeff Atwood
e83f050454 shorter email footer copy 2015-12-20 23:38:08 -08:00
Sam
f3e24bac4f we need spork rails to run our specs 2015-12-21 16:47:42 +11:00
Sam
2e6af399a8 update rails, remove spork 2015-12-21 16:39:15 +11:00
Sam
950b69cfb0 Prepare for Rails 5, don't simply include Rails be explicit 2015-12-21 16:15:30 +11:00
Sam
460675400f forgotten semicolons 2015-12-21 10:23:17 +11:00
Arpit Jalan
4c86758f74 FIX: show proper message on invite error 2015-12-20 22:13:37 +05:30
Sam
2470a0adbe remove max-height rule, it was messing up display of front page
was targetting .ember-view which is huge.
2015-12-20 18:27:10 +11:00
Sam
33df5372f6 comment out some tests for now 2015-12-20 17:49:35 +11:00
Sam
f9e6e5a66a PERF: properly preload all category notification levels 2015-12-20 17:47:02 +11:00
Sam
d20f6e0cb0 fix test and comment out js test for now 2015-12-20 17:34:15 +11:00
Sam
b7ce4bdc78 correct code 2015-12-20 17:21:31 +11:00
Sam
8496f8dfc2 FEATURE: display username user dropdown 2015-12-20 17:15:45 +11:00
Sam
63076a841e Merge branch 'refactor_user_page' 2015-12-20 16:50:33 +11:00
Sam
a8b5192efd FEATURE: User page refactor
Re-organise user page so it is easier to find interesting info
split it into tabs

- Introduce notifications and messages tabs
- Stop couting stuff for the user page to speed up rendering
- Suppress more information when viewing your own profile
2015-12-20 16:45:49 +11:00
Jeff Atwood
5efe4e7e73 Merge pull request #3820 from rubo77/patch-3
save height on small screens
2015-12-19 04:00:16 -08:00
Jeff Atwood
8546dcb7ea zopflipng all png images for reduced file size
..except emoji one which needs update anyway
2015-12-18 17:05:36 -08:00
Sam
ed71674c45 FIX: missing unique index on category_users 2015-12-19 10:30:23 +11:00
Jeff Atwood
e84864ab0e improved default avatar image 2015-12-18 15:22:00 -08:00
Régis Hanol
ca529a673a just use the address instead of building it ourselves 2015-12-18 17:54:42 +01:00
Neil Lalonde
9435dd777f Version bump to v1.5.0.beta7 2015-12-18 11:09:08 -05:00
Neil Lalonde
fe10f3e0a3 Update translations 2015-12-18 10:48:02 -05:00
Régis Hanol
e89d8e796e FIX: group messages notifications
Prevent double notifications when watching a group
Make sure mentions/quotes/replies in a group message shows up
2015-12-18 16:32:53 +01:00
Arpit Jalan
4c967d11b4 FEATURE: log site text changes 2015-12-18 19:42:06 +05:30
Régis Hanol
f48419526d Merge pull request #3927 from kellec/update-analytics-url
Add Discourse.getURL to the url passed into page view events
2015-12-18 12:30:58 +01:00
Kelle Connolly
a7aeeaffdb Add Discourse.getURL to the url passed into page view events
This means that instances in a subdirectory correctly receive the
subfolder string as a part of the path.
2015-12-18 14:17:51 +11:00
Régis Hanol
1704a362ef FIX: manually blocking/whitelisting an IP address wasn't working 2015-12-17 19:40:50 +01:00
Neil Lalonde
5eff3153e5 FIX: reply as linked topic has [object object] in composer 2015-12-17 12:11:28 -05:00
Sam
c3f08145b8 FIX: Chrome scrolling page up when you expand likes 2015-12-17 16:56:18 +11:00