Sam
79c109a819
Merge pull request #1322 from bhicks/refactor-feature-topic-users
...
Refactoring the feature_topic_users method
2013-08-14 20:04:54 -07:00
Sam
b55c9e391d
Merge pull request #1333 from fabianoleittes/fix_type_url
...
Fix url not to be nil
2013-08-14 20:04:00 -07:00
Sam
1eecb0cee5
use sigterm as opposed to hup, cause spork was not handling the hup correctly
2013-08-15 12:55:45 +10:00
Sam
dd29e0b3b9
removing Guardfile, we no longer use is and rake autospec covers everything it used to do.
2013-08-15 12:55:19 +10:00
Ben Hicks
b13796c35e
Refactoring the feature_topic_users method to improve
...
the code climate score.
2013-08-14 20:42:16 -05:00
Sam
1f0de36e41
extract method
2013-08-15 11:11:14 +10:00
Fabiano Leite
4df8babb9a
Fix url not to be nil
2013-08-14 21:55:25 -03:00
Sam
1965cbcad6
Merge pull request #1331 from ZogStriP/fix-avatars-on-activity-stream
...
FIX: performance regression on activity streams
2013-08-14 16:52:13 -07:00
Sam
c2653b2915
Merge pull request #1309 from stephankaag/sidetiq
...
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
Sam
997f2ee63a
Merge pull request #1317 from novemberkilo/master
...
Extract methods to improve flog score of TopicView
2013-08-14 16:50:13 -07:00
Régis Hanol
8af51883bf
FIX: performance regression on activity streams
2013-08-15 01:32:27 +02:00
Robin Ward
693bd7d7db
Merge pull request #1328 from abbat/patch-1
...
Generate avatars with transparent background
2013-08-14 15:10:29 -07:00
Neil Lalonde
9170166e93
Finish renaming blocked emails to screen emails
2013-08-14 16:45:30 -04:00
Robin Ward
3e7441177a
Merge pull request #1330 from ZogStriP/emails-can-be-mixed-case
...
only the host part of an email address is case insensitive
2013-08-14 13:26:49 -07:00
Neil Lalonde
86647f0a54
Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail.
2013-08-14 16:08:23 -04:00
Stephan Kaag
a6b4b5dbf2
Replace Clockwork with Sidetiq
2013-08-14 21:39:40 +02:00
Régis Hanol
5ca187ba57
only the host part of an email address is case insensitive
2013-08-14 19:31:35 +02:00
Robin Ward
8fa9c51bf4
FIX: New avatar regression with mixed case email addresses.
2013-08-14 13:05:57 -04:00
Robin Ward
aec929b184
Screw it, don't choose columns.
2013-08-14 12:26:31 -04:00
Robin Ward
a05ffafd4c
FIX: Direct link to Avatar
2013-08-14 12:22:44 -04:00
Robin Ward
479ca86713
FIX: Don't select columns if we don't have to.
2013-08-14 12:18:54 -04:00
Robin Ward
803f5d85ee
Merge branch 'master' of github.com:discourse/discourse
2013-08-14 12:04:51 -04:00
Robin Ward
6793cba4ae
FIX: Displaying actions
2013-08-14 12:04:35 -04:00
Neil Lalonde
bc0d4f1bfc
Add a confirm modal to Delete All Posts button
2013-08-14 11:48:18 -04:00
Robin Ward
b7c50ecdaa
FIX: Respect protocol relative URLs in email styling
2013-08-14 11:32:17 -04:00
Neil Lalonde
506dd748da
Add warning sign icons to all the delete user buttons
2013-08-14 11:20:00 -04:00
Anton Batenev
6b0e8e2ec1
Generate avatars with transparent background
...
Generate avatars with transparent background (for .png images) or with white background (for others).
2013-08-14 19:13:43 +04:00
Robin Ward
7cfb583016
Merge pull request #1324 from meglio/oneboxers
...
Add oneboxers for popular learning resources
2013-08-14 06:58:31 -07:00
Robin Ward
890d3d0f45
Merge pull request #1325 from ZogStriP/fix-n-plus-one-query-for-avatars
...
FIX: N+1 query for avatars
2013-08-14 06:57:31 -07:00
Robin Ward
b71ffe9160
Merge pull request #1326 from sanderdatema/dutch_translation
...
Updated Dutch translation
2013-08-14 06:56:52 -07:00
Sander Datema
e0636fa914
Updated Dutch translation
2013-08-14 15:47:48 +02:00
Régis Hanol
4866f4d8f5
FIX: N+1 query for avatars
2013-08-14 15:25:05 +02:00
Anton Andriyevskyy
a9ddad2b79
Add oneboxers for popular learning resources
2013-08-14 15:49:40 +03:00
Sam
d01d823e92
Merge pull request #1323 from ZogStriP/fix-avatars-in-quotes-in-already-cooked-posts
...
FIX: avatars in quotes/oneboxes
2013-08-14 04:21:20 -07:00
Régis Hanol
3524b90d6a
FIX: avatars in quotes/oneboxes
...
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
2013-08-14 12:20:05 +02:00
Navin
2ea15adad9
Extract methods to improve flog score of TopicView
2013-08-13 18:23:04 +02:00
Neil Lalonde
879652f055
Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits.
2013-08-12 11:12:20 -04:00
Robin Ward
f99bc4c43a
Merge pull request #1315 from abbat/master
...
Russian translation (actual version)
2013-08-12 07:30:54 -07:00
Anton Batenev
8e8167b41e
Russian translation (actual version)
2013-08-12 09:58:45 +04:00
Robin Ward
b20e57f52c
Merge pull request #1312 from snapstudiodesign/master
...
Fixes #1292 . PR will come for the image in a minute.
2013-08-11 09:16:11 -07:00
Robin Ward
1cb7f8476b
Merge pull request #1313 from charlieshum/patch-2
...
Update client.zh_TW.yml
2013-08-11 09:15:12 -07:00
Jeff Atwood
556cb792e9
change topic share button to match link button
2013-08-10 21:07:42 -07:00
charlieshum
199d6a3fcc
Update client.zh_TW.yml
...
update the translation by comparing with client.en.yml
2013-08-10 19:43:47 +08:00
Jeff Atwood
d09ac217bf
add link to main website at top
2013-08-09 16:35:25 -07:00
Ian Carroll
d37dea0bdf
Fixes #1292 . PR will come for the image in a minute.
2013-08-09 18:13:20 -04:00
Neil Lalonde
bb492eb8bf
Add filtering to staff logs page
2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6
Include a list of more new topics in the digest emails at the bottom
2013-08-09 14:43:02 -04:00
Robin Ward
730f57a751
Tiny CSS change: add background to inline code values.
2013-08-09 12:54:46 -04:00
Robin Ward
6452962f36
FIX: Notification counters were being updated incorrectly.
2013-08-09 12:12:56 -04:00
Neil Lalonde
4d8585ac10
Put staff user in the first column
2013-08-09 11:24:50 -04:00
