Sam
82ca61f150
Merge pull request #1350 from michaelkirk/feature/oauth2
...
Feature/oauth2
2013-08-18 17:01:01 -07:00
Sam
1cab98bf78
Merge pull request #1336 from novemberkilo/master
...
First pass at fixing rails4 deprecation warnings
2013-08-18 16:59:07 -07:00
Chris Hunt
4372fc2f2e
Switch out faviconNotify for favcount.js
2013-08-18 11:26:03 -07:00
Sam
3f5b5f1581
Merge branch 'master' of github.com:discourse/discourse
2013-08-18 21:30:14 +10:00
Michael Kirk
4af8a9102e
Authenticate with Discourse via OAuth2
...
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
2013-08-17 21:45:20 -07:00
Sam
3735cfdadb
Merge pull request #1348 from chrishunt/dynamically-png-me
...
Re-write dynamic favicon javascript
2013-08-17 03:26:14 -07:00
Chris Hunt
ef7231a66f
Add 32px image to default favicons (for retina)
2013-08-16 18:37:33 -07:00
Chris Hunt
fb9f1ae3e8
Totally re-write favicon notifier
...
- Black on white text
- Larger font
- Works with any size favicon (16, 32, 64)
2013-08-16 18:37:24 -07:00
Régis Hanol
ea6e73076b
change your avatar in a modal
2013-08-17 00:35:29 +02:00
Neil Lalonde
baff59d752
Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting.
2013-08-16 17:28:36 -04:00
Neil Lalonde
7dd470ccc0
Oops, make highlight in topic list style-able too
2013-08-16 14:24:51 -04:00
Robin Ward
40599d20e8
FIX: Footer formatting in digest emails
2013-08-16 12:19:26 -04:00
Neil Lalonde
b6285b85d2
Add reject option to pending users page
2013-08-16 11:42:43 -04:00
Robin Ward
30caa0d0b0
Merge pull request #1339 from ZogStriP/fix-custom-avatars-in-email
...
FIX: custom avatars in email
2013-08-16 07:18:34 -07:00
Régis Hanol
865c882a61
larger avatars in embedded posts
2013-08-16 10:14:05 +02:00
Régis Hanol
2119774fb6
FIX: custom avatars in email
2013-08-16 09:58:20 +02:00
Sam
c314a1862f
add todo
2013-08-16 17:04:30 +10:00
Jeff Atwood
946b02533b
better copy for password change button
2013-08-15 22:25:26 -07:00
Sam
b60c8080e5
Merge pull request #1337 from ZogStriP/avatar-work
...
Avatar work
2013-08-15 21:50:37 -07:00
Jeff Atwood
4718929d52
"change" to edit pencil glyph on user pref buttons
2013-08-15 16:11:24 -07:00
Régis Hanol
c9969738bf
FIX: N+1 query for avatars when searching for users
2013-08-16 00:26:49 +02:00
Jeff Atwood
8303f48004
add dimmed color to digest footer
2013-08-15 15:18:11 -07:00
Neil Lalonde
2e640baffd
Fix a broken avatar when showing who deleted a post
2013-08-15 16:31:13 -04:00
Neil Lalonde
73e4d866d2
Make it possible to customize post highlight colour with css
2013-08-15 16:17:37 -04:00
Neil Lalonde
8a96c4c0f6
Fix uncategorized topics not being shown on categories page
2013-08-15 15:18:04 -04:00
Neil Lalonde
5a4b939cf7
Fix edit category modal for uncategorized when showing it the second time
2013-08-15 15:18:04 -04:00
Navin
9ab2471a92
Fix rails4 deprecation warnings
...
That appear when running topic_spec.rb
2013-08-15 17:52:18 +02:00
Neil Lalonde
293361dcd3
Screened URLs list in admin
2013-08-15 10:52:26 -04:00
Sam
ee95d7df9c
trigger observers, wow this is all very complicated and full of duct tape
2013-08-15 13:54:48 +10:00
Sam
fda6cce0de
minor refactor
2013-08-15 13:44:30 +10:00
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
Ben Hicks
b13796c35e
Refactoring the feature_topic_users method to improve
...
the code climate score.
2013-08-14 20:42:16 -05:00
Fabiano Leite
4df8babb9a
Fix url not to be nil
2013-08-14 21:55:25 -03: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
Neil Lalonde
506dd748da
Add warning sign icons to all the delete user buttons
2013-08-14 11:20:00 -04:00
Régis Hanol
4866f4d8f5
FIX: N+1 query for avatars
2013-08-14 15:25:05 +02: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
Sam
11dca1fd92
make code climate a bit happier
2013-08-06 06:25:44 +10: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
Régis Hanol
8af51883bf
FIX: performance regression on activity streams
2013-08-15 01:32:27 +02: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
Sam
6e97ddc8ef
allow uploaded avatars by default
2013-08-05 14:08:08 +10:00
Sam
5f46dfedf1
Merge pull request #1320 from ZogStriP/local-avatars
...
Local avatars
2013-08-14 00:36:42 -07:00
Régis Hanol
9a7df140b7
updated model annotations
2013-08-13 22:09:27 +02:00
Régis Hanol
92b0cfe3d3
cleaned up non-used code
2013-08-13 22:09:10 +02:00
Régis Hanol
c867b67a0b
custom avatar support
2013-08-13 22:08:29 +02:00
Régis Hanol
e5e3164ea1
added the "allow uploaded avatars" site setting
2013-08-13 22:06:22 +02:00
Régis Hanol
95a2405c9e
larger avatar in the "in reply to" box
...
This one is for @BrentleyJones (cf.
http://meta.discourse.org/t/small-avatar-in-in-reply-to-box/8761 )
2013-08-13 22:04:38 +02:00
Neil Lalonde
ed060ed5f1
Change trust level logs the previous trust level
2013-08-13 12:04:28 -04:00
Jeff Atwood
6722a1fe22
some minor user deletion tweaks
2013-08-13 00:41:23 -07:00
Neil Lalonde
b36c6d7b78
Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days.
2013-08-12 14:55:09 -04: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
Jeff Atwood
556cb792e9
change topic share button to match link button
2013-08-10 21:07:42 -07: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
Neil Lalonde
90a3bcf6ff
Add filter by action to staff logs page
2013-08-09 10:06:59 -04:00
Neil Lalonde
33bddbff85
Use Ember.ListView for staff action logs page
2013-08-09 10:06:58 -04:00
Neil Lalonde
0d44313a4b
Use Ember.ListView for blocked emails list
2013-08-09 10:06:58 -04:00
Robin Ward
7fdaefcd86
FIX: Should allow support for ember list view
2013-08-08 23:13:26 -04:00
Robin Ward
477eb81bc9
Updated docs for `Discourse.Singleton`
2013-08-08 13:00:48 -04:00
Neil Lalonde
ce05b43c1d
Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful
2013-08-08 12:54:38 -04:00
Robin Ward
86246a64eb
Convert `Discourse.Site` and `Discourse.ScreenTrack` to use `Discourse.Singleton`
2013-08-08 12:49:58 -04:00
Robin Ward
51f5cf77fb
Convert `Discourse.User` to use `Discourse.Singleton`
2013-08-08 12:42:08 -04:00
Robin Ward
8e1fae0459
Add `Discourse.Singleton` class mixin for creating singletons.
2013-08-08 12:00:58 -04:00
Robin Ward
9564a6ce09
Don't include `user_deleted` posts in emails.
2013-08-08 10:32:51 -04:00
Jeff Atwood
7343874360
oops, meant both
2013-08-07 16:42:26 -07:00
Jeff Atwood
0ab5388839
hook nth-of-type to reply, not "row"
2013-08-07 16:38:54 -07:00
Jeff Atwood
6656410c58
reduce padding between repeat embedded posts
2013-08-07 16:31:07 -07:00
Jeff Atwood
6caf55994b
tighten up user page spacing a tiny bit
2013-08-07 16:11:16 -07:00
Neil Lalonde
b097d780d0
Tweaks to staff action logs page
2013-08-07 18:29:13 -04:00
Neil Lalonde
b6b30dabd4
Send context of where a user was deleted as a spammer so it can be logged
2013-08-07 18:18:18 -04:00
Neil Lalonde
949b2068a5
Trust level change logs the target_user_id
2013-08-07 17:01:59 -04:00
Neil Lalonde
b0848db6de
Oops, forgot to use i18n in some places
2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a
Add a way to view staff action logs in admin
2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f
Blocked Emails list in admin
2013-08-07 16:27:34 -04:00
Robin Ward
c091b44028
Merge pull request #1310 from ZogStriP/patch-1
...
create thumbnails by defaults
2013-08-07 13:24:30 -07:00
Robin Ward
66f9506481
FIX: IE9 regression
2013-08-07 16:20:22 -04:00
Régis Hanol
bbd05f37d2
create thumbnails by defaults
...
changed "create_thumbnails" default value to `true`
2013-08-07 22:18:50 +02:00
Robin Ward
fe3a69c271
Private message emails now include the history
2013-08-07 13:03:45 -04:00
Don Denton
a53a6667aa
Added a missing "#" to href for TOS.
2013-08-07 00:45:55 -04:00
Robin Ward
1c3804934e
Show the entire history of replies above a post when you expend "in reply to"
2013-08-06 17:43:10 -04:00
Neil Lalonde
c74da0d262
Admins who haven't been approved can log in when must_approve_users is enabled
2013-08-06 16:51:29 -04:00
Neil Lalonde
57baf1f112
Logout takes you to the front page instead of leaving you on your user activity page
2013-08-06 16:04:02 -04:00
Neil Lalonde
879aa06601
Change tiny date formatting for dates in past years. Example: 10 Dec '12
2013-08-06 13:47:24 -04:00
Jeff Atwood
890ded7b1b
make topic progress more visible
2013-08-05 15:10:53 -07:00