Commit Graph

22648 Commits

Author SHA1 Message Date
Régis Hanol
ccd4832726 Add 'slight_smile' emoji translations 2017-03-22 10:17:10 +01:00
Arpit Jalan
786fd6bbd2 Merge pull request #4774 from techAPJ/email-prefix
FIX: use email prefix only in subject
2017-03-22 14:18:50 +05:30
Arpit Jalan
295cf8839e FIX: better error message when invited user already exists 2017-03-22 13:55:28 +05:30
Guo Xiang Tan
e8fc8f0bb6 Update annotations. 2017-03-22 14:26:53 +08:00
Matt Palmer
da7a44064b Fix purge_tombstone for the brave new world of secure command execution 2017-03-22 10:27:07 +11:00
Robin Ward
1cd14ef3aa FIX: Site Settings weirdness with back button 2017-03-21 16:13:19 -04:00
Robin Ward
874e8900af Display email address in SSO error message. 2017-03-21 15:37:46 -04:00
Robin Ward
aeaf5075bf Custom errors for when Email is invalid via SSO 2017-03-21 15:23:38 -04:00
Robin Ward
52d78294cc Render a layout when there's an SSO error 2017-03-21 15:23:38 -04:00
Arpit Jalan
7f207fd411 Merge pull request #4771 from techAPJ/user-summary-tab
FEATURE: make summary as first tab on user page
2017-03-21 23:14:07 +05:30
Arpit Jalan
ec2a66d1f0 FEATURE: make summary as first tab on user page
https://meta.discourse.org/t/custom-user-fields-show-on-activity-but-not-summary-page/59196/3?u=techapj
2017-03-21 23:12:28 +05:30
Neil Lalonde
2836d548fb Category boxes with feature topics will show pins and locks as bullet for pinned and closed/archived topics 2017-03-21 12:23:19 -04:00
Arpit Jalan
1853a4852c FIX: use email prefix only in subject 2017-03-21 20:29:57 +05:30
Arpit Jalan
df246c79b6 FEATURE: add user profile fields in user list export 2017-03-21 15:51:52 +05:30
Arpit Jalan
82c0f5f587 Merge pull request #4767 from techAPJ/activate-account
FIX: send activation email if user have unconfirmed email address
2017-03-21 09:44:23 +05:30
Arpit Jalan
7c3ae50dcd FIX: send activation email if user have unconfirmed email 2017-03-21 09:41:50 +05:30
Guo Xiang Tan
0cfc4db868 Merge pull request #4769 from gsambrotta/admin-users-list-style
add style to show admin/users header as clickable
2017-03-21 10:07:05 +08:00
Sam Saffron
b94c7b4902 missing disposition 2017-03-20 17:07:32 -04:00
Sam
74dbe877d8 test for side effect without mock 2017-03-20 16:15:23 -04:00
Sam
652b2d7199 remove redundent header setting 2017-03-20 16:08:18 -04:00
Sam
c106ca6778 FEATURE: fallback asset path for multi host setups 2017-03-20 15:59:17 -04:00
Neil Lalonde
9c03456e75 Category description in sub-category boxes is truncated after height 6em, customizable with CSS 2017-03-20 15:43:49 -04:00
Neil Lalonde
e96d875bee FIX: show lock icons for secured categories in boxes views 2017-03-20 14:50:52 -04:00
Neil Lalonde
0238a076f3 Change category-boxes so it's easier to customize with CSS 2017-03-20 14:50:52 -04:00
Neil Lalonde
85280b0bc8 FIX: links in category description inside subcategory boxes have too much padding 2017-03-20 14:50:52 -04:00
Sam
bc96f0fe78 rescue failure to backup assets 2017-03-20 13:43:59 -04:00
Sam
e14a63cc88 FEATURE: add support for backup asset path post precompile 2017-03-20 13:05:39 -04:00
Sam
2640b4e173 FEATURE: add hook and asset path variable 2017-03-20 12:12:22 -04:00
Neil Lalonde
482578ba26 Version bump to v1.8.0.beta8 2017-03-20 12:05:03 -04:00
Neil Lalonde
8b1bfeb4c6 Update translations 2017-03-20 11:04:34 -04:00
Arpit Jalan
8cbfa24ca2 Fix failing test 2017-03-20 20:14:25 +05:30
giorgia
b8ee2cabcf add style to make tabs clickable 2017-03-20 15:23:00 +01:00
Sam
13fd8a45e3 Merge pull request #4768 from gsambrotta/fix-pr-4747
Delete disabled Category button: remove tooltip on hover on desktop
2017-03-20 09:57:16 -04:00
giorgia
c3e8497636 remove tooltip on hover on desktop 2017-03-20 13:26:36 +01:00
Arpit Jalan
521c88fe58 FIX: enqueue activation email for invited user that has password set 2017-03-20 17:13:21 +05:30
Guo Xiang Tan
1d4993a185 FIX: Sync user's notification channel before preloaded current user data.
This is to fix the problem where a newly created user would not
receive live updates for the first notification if the notification
is published before the client has subscribed to the channel.
2017-03-20 17:17:21 +08:00
Guo Xiang Tan
32d8447838 REFACTOR: Don't lookup container for certain objects if user is not signed in. 2017-03-20 15:49:36 +08:00
Guo Xiang Tan
ddc8abf9d8 Fix broken optimize image command. 2017-03-20 15:07:38 +08:00
Guo Xiang Tan
a1d04a7a9a Fix rspec tests. 2017-03-20 12:35:08 +08:00
Guo Xiang Tan
6057e17ae7 Fix weird test failure. 2017-03-20 12:06:37 +08:00
Guo Xiang Tan
a567e6bec9 FIX: Publish notification state in after_commit hook.
`after_save` is still wrapped in a transaction and
we were getting intermittent failures with notifications
state not being published.
2017-03-20 11:38:34 +08:00
Guo Xiang Tan
11dbadb96f Fix tests. 2017-03-20 11:19:20 +08:00
Jeff Atwood
0f9fb01c6b Merge pull request #4766 from davidtaylorhq/twitter_onebox_fixes
Twitter onebox improvements
2017-03-17 14:04:55 -07:00
Neil Lalonde
9ae8813a53 FIX: admin user page should show count of all posts, including private messages, so admins can delete them. This bug was making it impossible to delete users. 2017-03-17 17:01:45 -04:00
David Taylor
89d41ecb39 Add support for oneboxing twitter videos 2017-03-17 20:49:29 +00:00
David Taylor
ea45cc1293 Request full tweets, since twitter has increased the allowed length 2017-03-17 20:36:53 +00:00
Robin Ward
f5f54c1b77 Merge pull request #4764 from tgxworld/nuke_backticks
FIX: Don't use backticks that take in inputs.
2017-03-17 15:40:23 -04:00
Neil Lalonde
0991acf103 make it easier to customize category boxes with featured topics 2017-03-17 12:33:26 -04:00
ElTipejoLoco
e234a7821d Add "Show tracked topics" to User Preferences
Does what it says on the tin. Minor clean-up.
2017-03-17 08:05:21 -05:00
Régis Hanol
e600dca268 Merge pull request #4763 from vvanpo/fork-master
JSON API parsing error on CSRF exception: single quotes in ['BAD CSRF'] is invalid JSON
2017-03-17 09:19:10 +01:00