Robin Ward
75eb3ae664
Merge pull request #3931 from tgxworld/fix_pluralize
...
FIX: Pluralization error when only a pluralization key is overridden.
2015-12-29 10:21:23 -05:00
Robin Ward
55a5154323
Merge pull request #3933 from gschlager/phpbb3-importer
...
FIX: Correctly import users and passwords from phpBB 3.1
2015-12-29 10:20:56 -05:00
Robin Ward
e4adfdb624
Merge pull request #3936 from tgxworld/add_saving_status_to_groups_admin
...
Add saving status to groups admin
2015-12-29 10:18:02 -05:00
Guo Xiang Tan
e89f29cca7
FIX: Pluralization error when overriding translations.
2015-12-29 10:31:23 +08:00
Jeff Atwood
0613399d7a
Merge pull request #3940 from mcwumbly/slack_unfurl_heart
...
UX: replace 💚 with ❤️ in slack unfurling
2015-12-28 15:25:57 -08:00
Jeff Atwood
931da1db18
Merge pull request #3938 from scossar/popup-message-in-preview
...
Show composer messages popup overtop of preview window
2015-12-28 15:25:26 -08:00
scossar
cc2093f32b
add semicolon
2015-12-28 14:49:24 -08:00
David McClure
7654c855b4
UX: replace 💚 with ❤️ in slack unfurling
2015-12-28 17:46:00 -05:00
scossar
993f63ee2b
add category-logo-link component
2015-12-28 14:39:27 -08:00
scossar
0fba9443a6
show popup menu over preview window
2015-12-28 13:51:07 -08:00
Arpit Jalan
6ef1537ee0
FEATURE: better unfurling of Discourse topics on Slack
2015-12-28 19:10:19 +05:30
Sam
0fdac4fc42
Update Gemfile
...
fix for certain bundlers
2015-12-28 22:32:45 +11:00
Guo Xiang Tan
1c3d4a6d15
UX: Missing tag attribute.
2015-12-28 11:39:15 +08:00
Guo Xiang Tan
778ae06000
UX: Add saving status to groups admin.
2015-12-28 11:25:30 +08:00
Guo Xiang Tan
2fd228d95a
UX: Too much spacing between usernames.
2015-12-28 11:20:32 +08:00
Guo Xiang Tan
ba29bba987
Add Ruby 2.3 platform to profiling tools in Gemfile.
2015-12-28 09:53:52 +08:00
Sam
4f04099015
Merge pull request #3932 from tgxworld/fix_vulnerable_gems
...
FIX: Update vulnerable gems.
2015-12-27 21:33:44 +11:00
Gerhard Schlager
f2663ecb09
FIX: Correctly import users and passwords from phpBB 3.1
...
- Ruby doesn't support the $2y$ prefix used for bcrypt Blowfish hashes.
- The importer ignored users that didn't have optional profile fields.
2015-12-26 23:05:19 +01:00
Guo Xiang Tan
c4b1817583
FIX: Update vulnerable gems.
2015-12-26 14:02:42 +08:00
Guo Xiang Tan
137191f486
Run tests with Ruby 2.3.0 on TravisCI.
2015-12-26 13:11:30 +08:00
Arpit Jalan
797e179e2d
update onebox gem
2015-12-26 10:22:57 +05:30
Arpit Jalan
3a28bafc0f
FEATURE: onebox internal audio or video files
2015-12-25 01:52:14 +05:30
Sam
14a86dd125
tweak styling
2015-12-24 10:10:00 +11:00
Sam
7ae1846834
improve user page styling
2015-12-24 09:45:09 +11:00
Robin Ward
f423869e03
FIX: forgot end :)
2015-12-23 16:43:39 -05:00
Robin Ward
d792c0a1d7
Should not be active in dev mode
2015-12-23 16:39:56 -05:00
Robin Ward
eab9ad7b27
FIX: Was refocusing on resize events
...
This was annoying on small screens in desktop mode, where a keyboard
appearing would refocus on the search bar and make it impossible to
dismiss.
2015-12-23 15:17:00 -05:00
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
