Jeff Atwood
bd66c67398
whoops, used font awesome 3.2 styles :(
2014-08-24 22:20:59 -07:00
Jeff Atwood
01853fb9d3
replace trophy with shield to indicate admin
2014-08-24 22:05:11 -07:00
Sam
de7888cd97
reopen logs on usr1
2014-08-25 10:49:13 +10:00
Sam
56a0a40175
Merge pull request #2677 from keskuskentta/fi_locale
...
Add Finnish
2014-08-25 08:44:00 +10:00
Sam
9a8d7d3ef0
comment gemfile
2014-08-25 08:22:14 +10:00
Sam
32d1e962d2
Merge pull request #2689 from chancancode/lock_mail_gem
...
Lock `mail` gem to ~> 2.5.4
2014-08-25 08:21:41 +10:00
Sam
1c5bbeb348
Merge pull request #2690 from chancancode/use_latest_seed_fu
...
Use the latest version of seed-fu
2014-08-25 08:21:10 +10:00
Sam
643d0dfc13
FIX: use CDN when expanding avatar templates
2014-08-25 08:18:41 +10:00
Godfrey Chan
09b9cec009
Use the latest version of seed-fu
...
seed-fu#54 has been merged, so we don't have to use the custom fork anymore.
It also include some changes that are required for Rails 4.2+, at least for now.
See d6c1205584 (commitcomment-7502487)
2014-08-24 02:39:05 -07:00
Jeff Atwood
146eec53c0
move email_domains_white/blacklist to login cat
2014-08-24 02:06:51 -07:00
Godfrey Chan
b0f35cbf6a
Lock mail gem to ~> 2.5.4
...
Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`.
However, mail gem 2.6.x currently does not work with discourse because of the
reference to `Mail::RFC2822Parser` in `lib/email.rb`. This ensure discourse
would continue to work with Rails 4.1.6+ when it is released.
2014-08-24 00:43:08 -07:00
Robin Ward
a11a21ca09
Merge pull request #2688 from Elberet/tests-passed
...
Workaround markdown-js links parser bug
2014-08-23 20:33:13 -04:00
Jeff Atwood
db0b6703a3
better copy on S3 upload settings
2014-08-23 17:01:05 -07:00
Jens Maier
b8f5c21df0
Workaround markdown-js links parser bug
2014-08-24 01:56:14 +02:00
Régis Hanol
76824cda31
FIX: completely disable emails in importers
2014-08-23 11:12:01 +02:00
Régis Hanol
77ba2015eb
FEATURE: new disable_emails site setting
2014-08-23 11:07:37 +02:00
Sam
244323d218
FEATURE: restyle poll buttons
2014-08-23 10:50:45 +10:00
Sam
af71307363
Add 10px margin for buttons in mobile
2014-08-23 10:41:48 +10:00
Sam
e0a74e336a
Add SSO diagnostics
2014-08-23 10:34:48 +10:00
Sam
f493eb5d12
FEATURE: allow version emails to be disabled globally
2014-08-23 10:02:32 +10:00
Jeff Atwood
ae9fcf17ef
make period chooser (/top h2) unselectable on touch
2014-08-22 17:01:12 -07:00
Robin Ward
f67f34d889
FIX: Load order of Javascript files
2014-08-22 19:27:20 -04:00
Robin Ward
db376d16d3
FIX: Topic entrance widget wasn't disappearing
2014-08-22 18:45:48 -04:00
Neil Lalonde
bbb358b356
Add likes given and likes received requirement for being TL3. Configure with site settings leader_requires_likes_given and leader_requires_likes_received.
2014-08-22 17:33:39 -04:00
Robin Ward
94ca45b20b
Merge pull request #2684 from riking/lazyyt-fix
...
Update LazyYT for new onebox version
2014-08-22 17:28:33 -04:00
Robin Ward
e8cade40c7
Improve search results by introducing an aggregate post search data
...
filter. It seems performant despite the extra content being searched.
2014-08-22 16:56:26 -04:00
Jeff Atwood
f171af5fe5
minor copyedit
2014-08-22 12:49:02 -07:00
Neil Lalonde
00c28f2391
Show total likes given. Put likes given/received and flags given/received together.
2014-08-22 15:23:19 -04:00
riking
277b7dc831
Update LazyYT for new onebox version
...
Much simpler code!
2014-08-22 12:21:02 -07:00
Jeff Atwood
79f7a922ef
add <hr> between sections of digest email
2014-08-22 12:15:02 -07:00
Régis Hanol
626e7c6e3d
ignore 'public/csv/'
2014-08-22 21:10:15 +02:00
Robin Ward
b1eb44bd0b
Merge pull request #2678 from techAPJ/patch-2
...
FIX: lazyYT youtube links not getting included in email
2014-08-22 14:54:41 -04:00
Robin Ward
2ae46b4742
REMOVE: Auto quoting confused more people than it helped.
2014-08-22 14:51:31 -04:00
Arpit Jalan
f92b69ed2f
FIX: lazyYT youtube links not getting included in email
2014-08-23 00:21:31 +05:30
Neil Lalonde
dafc63e3a0
Show how many likes users received in the last 100 days on their admin profile page
2014-08-22 14:37:07 -04:00
Robin Ward
300dbdc88b
FIX: BBCode contents can span multiple lines
2014-08-22 14:32:29 -04:00
Neil Lalonde
5454c1ed24
Updated model anotations
2014-08-22 13:01:44 -04:00
Neil Lalonde
7756b72a59
FIX: after bulk change category, refresh topic list
2014-08-22 13:01:08 -04:00
Neil Lalonde
05d2083796
FIX: can delete category if topic_count < 0
2014-08-22 12:25:28 -04:00
Robin Ward
104b39540a
FIX: BBCode with params couldn't span lines
2014-08-22 12:14:10 -04:00
Régis Hanol
f422e5c8c4
Merge pull request #2683 from awesomerobot/master
...
adding highlight back to topic-list
2014-08-22 17:19:11 +02:00
Kris Aubuchon
a8e6e1e3d5
adding highlight back to topic-list
2014-08-22 10:45:51 -04:00
Jeff Atwood
fd0a0aafb4
Merge pull request #2682 from techAPJ/patch-1
...
Suppress share link for anonymous users
2014-08-22 01:35:16 -07:00
Arpit Jalan
6a0309365f
Suppress share link for anonymous users
2014-08-22 13:53:28 +05:30
Régis Hanol
071325ab98
VANILLA: the name is actually the username (WAT)
2014-08-22 10:11:12 +02:00
Sam
12b0d5b7bb
update onebox
2014-08-22 11:39:23 +10:00
Sam
ab73d046a0
add comment for alternate source
2014-08-22 11:38:31 +10:00
Sam
492aca05c2
FIX: authorized callback deprecated
2014-08-22 11:05:20 +10:00
Sam
00ab6f5faa
Gem updates
2014-08-22 10:34:08 +10:00
Sam
ac4f6d9c97
Merge pull request #2647 from riking/multiple-addresses
...
Allow processing of email sent to multiple addresses
2014-08-22 10:32:42 +10:00
