Commit Graph

2226 Commits

Author SHA1 Message Date
Sam
9b5da77855 correct broken logic in screen track that was causing read status not to flush properly when navigating using the suggested topics list. 2013-08-19 11:35:06 +10:00
Sam
4b0a1179e9 link to first unread as opposed to last read in topic lists 2013-08-19 11:34:08 +10:00
Sam
b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Sam
3b34ab8cab Merge branch 'master' of github.com:discourse/discourse 2013-08-18 21:35:29 +10:00
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