Commit Graph

16713 Commits

Author SHA1 Message Date
Régis Hanol 1906b99d1f Merge pull request #3887 from tgxworld/fix_duplicated_custom_badges
FIX: Duplicated custom badges in AdminBadgesController.
2015-11-02 09:47:02 +01:00
Arpit Jalan 700c005c26 PERF: optimize export user list CSV queries 2015-11-02 13:15:58 +05:30
Guo Xiang Tan 30bddd1112 FIX: Duplicated custom badges in AdminBadgesController. 2015-11-02 13:13:17 +08:00
Sam 48ef609003 correct implementation add tests 2015-11-02 15:05:08 +11:00
Sam 3575012a47 correct implementation 2015-11-02 14:59:10 +11:00
Sam 2c4f290786 docker dev binaries 2015-11-02 13:33:08 +11:00
Sam fbb6eba252 Merge branch 'master' of github.com:discourse/discourse 2015-11-02 13:24:42 +11:00
Sam eaae72c3e4 improve watching logic 2015-11-02 13:24:24 +11:00
Sam Saffron 606b10445e FEATURE: remove muted topics from suggested and latest 2015-11-02 09:20:22 +11:00
Sam Saffron 0d15dbd886 FIX: lastPoster not defined correctly in model 2015-11-01 14:30:54 +11:00
Arpit Jalan 33fb870e48 add Jive import script 2015-10-31 10:05:47 +05:30
Sam Saffron 54da461024 UX: simplify Dismiss menu 2015-10-31 15:31:05 +11:00
Régis Hanol 5c0fb34eee FIX: resize emoji job was generate errors 2015-10-30 23:31:30 +01:00
Régis Hanol 7fbf902d09 FIX: prevent cross-contamination of emojis in multisites 2015-10-30 23:26:34 +01:00
Régis Hanol 5e3da94c46 FIX: prevent infinite loop in PullHotlinkedImages job 2015-10-30 22:46:46 +01:00
Robin Ward 7eafca8f9d Remove unused translations 2015-10-30 15:31:44 -04:00
Robin Ward eaa31cf488 Merge pull request #3886 from LeoMcA/filter-by-username
filter by username in email digest preview
2015-10-30 14:44:50 -04:00
Robin Ward 21b29269d0 Remove excessive text on signup CTA 2015-10-30 14:13:16 -04:00
Leo McArdle fe5264f9e9 filter by username in email digest preview
adds a user prompt on the email digest preview page to generate a preview for a particular user
also fixes some broken styling on the page
2015-10-30 18:11:38 +00:00
Robin Ward 2f58663dda Merge pull request #3885 from devopsgroup-io/master
Digital Ocean should be DigitalOcean https://www.digitalocean.com/leg
2015-10-30 14:05:39 -04:00
Seth Reeser 85da9c6ff8 Digital Ocean should be DigitalOcean https://www.digitalocean.com/legal/terms/ 2015-10-30 13:31:48 -04:00
Régis Hanol bde4bc52d7 UX: use 'last poster' avatar for mobile topics list 2015-10-30 16:50:46 +01:00
Arpit Jalan 574805b682 Update Translations 2015-10-30 18:16:52 +05:30
Arpit Jalan 106cb9874a FIX: show 404 page when user is logged out and navigates to private message 2015-10-30 17:41:55 +05:30
Arpit Jalan 9f8d6b6088 FIX: allow exisiting users to be invited to topic/message when enable_local_logins is disabled 2015-10-30 11:28:05 +05:30
Robin Ward 6c6d406e63 Small fixes to import base. 2015-10-29 16:47:27 -04:00
Robin Ward 1f6e40eebe FIX: typo 2015-10-29 16:07:45 -04:00
Robin Ward c68cbe700b FIX: Better link extraction than `URL.regexp` 2015-10-29 16:02:11 -04:00
Robin Ward fe901163cc FIX: Fetch honeypot on `init` not name change which was error prone 2015-10-29 13:44:27 -04:00
Robin Ward 0b4c9005f9 FIX: Don't include `name` in hash when names are disabled.
This could break some SSO implementations due to honeypot
not being triggered.
2015-10-29 12:19:45 -04:00
Régis Hanol b9437936ab Merge pull request #3848 from gschlager/patch-2
Remove example CSS selectors from locale file
2015-10-29 10:01:52 +01:00
Régis Hanol 93cb2813cf Merge pull request #3863 from tgxworld/fix_last_posted_at_not_updated
FIX: Topic#last_posted_at was not being set when changing topic times…
2015-10-29 10:00:57 +01:00
Robin Ward a9823ab59a FIX: Use a cookie to bypass the anon cache 2015-10-28 17:16:56 -04:00
Robin Ward db5379508e FIX: Don't show an anonymous cache if there is a flash 2015-10-28 15:12:05 -04:00
Régis Hanol bb79e6aff7 FEATURE: new hide_user_profiles_from_public site setting 2015-10-28 19:56:08 +01:00
Robin Ward d9997a6b9e Add auto link support to the email formatter 2015-10-28 13:31:28 -04:00
Robin Ward 971af6a762 FIX: PostAlerter should ignore deleted posts 2015-10-28 13:03:54 -04:00
Arpit Jalan 734c272de8 UX: universal date format in digest email 2015-10-28 22:18:23 +05:30
Robin Ward 23371b026d FIX: Don't raise an error if you try to assign a group that exists 2015-10-28 12:21:54 -04:00
Robin Ward 6b236d3c83 FEATURE: Bulk Unlisting of topics 2015-10-27 16:57:40 -04:00
Robin Ward 46ca66771b FIX: Better error message for resending activation. Don't limit staff. 2015-10-27 16:25:30 -04:00
Robin Ward 010d847c2d Extensibility point for adding a new main button below topics 2015-10-27 15:05:59 -04:00
Robin Ward ebb16bfafc FIX: mbox import should respect date order after grouping 2015-10-27 14:22:07 -04:00
Robin Ward 4b332513b4 Merge pull request #3872 from carsonreinke/memory_diagnostics
#compact! can return nil if no changes were made
2015-10-28 03:37:20 +11:00
Carson Reinke df916e86b7 compact! only returns array if changes were made 2015-10-27 12:27:37 -04:00
Carson Reinke 6c172a30d3 #compact! can return nil if no changes were made 2015-10-27 12:14:18 -04:00
Régis Hanol 5d59e03ed5 Merge pull request #3871 from cpradio/user-profile-invite-trust-classes
UX: Add custom classes to the profile page to permit hiding the invited_by and trust_level fields
2015-10-27 15:10:14 +01:00
cpradio 68660cb9ac UX: Add custom classes to the profile page to permit hiding the invited_by and trust_level fields 2015-10-27 09:57:01 -04:00
Régis Hanol 9ea2d30105 UX: always show the avatar modal now that we have the letter avatars 2015-10-27 10:52:05 +01:00
Arpit Jalan 5dab5ada1c FIX: loading members on group page was broken 2015-10-27 09:20:49 +05:30