Commit Graph

126 Commits

Author SHA1 Message Date
Dan Callahan
7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Robin Ward
b66b17bf19 Merge pull request #300 from goshakkk/cleanup
Minor cleanup, using AR querying DSL over raw SQL in some places
2013-03-01 07:52:34 -08:00
Kirill Pimenov
a168dc915e Secure gravatar 2013-03-01 00:58:36 +04:00
Robin Ward
628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Neil Lalonde
a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Gosha Arinich
6e5399d544 minor cleanup, using AR querying DSL over raw SQL in some places 2013-02-28 21:54:12 +03:00
Robin Ward
6c25eca2d6 Merge pull request #296 from goshakkk/refactor-user
Refactor User and TrustLevel a bit
2013-02-28 08:17:21 -08:00
Gosha Arinich
d2f3c829db refactor User and TrustLevel a bit
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
  `TrustLevel#level_key`
2013-02-28 19:15:54 +03:00
Robin Ward
9c0cbe8311 Merge pull request #298 from nverba/login-buttons
added option to enable/disable login buttons individually
2013-02-28 08:13:04 -08:00
nverba
b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward
dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Robin Ward
7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward
cf867a35ff Merge pull request #271 from goshakkk/topic-refactor
Refactor Topic
2013-02-27 10:32:44 -08:00
Robin Ward
007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
2013-02-27 12:09:22 -05:00
Alexander
8855a0bfbe RSS of a topic via new route
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
2013-02-26 14:54:17 -08:00
Neil Lalonde
cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05:00
Gosha Arinich
12d664a610 refactor Topic
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
2013-02-26 19:27:59 +03:00
nverba
b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich
cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
Gosha Arinich
054a699886 avoid unused variable warning in Topic 2013-02-25 22:13:36 +03:00
Sam Saffron
77a2d8ccc4 fixed a pile of notification craziness
addes some tests around post timings
2013-02-25 18:42:42 +11:00
Sam Saffron
b0b0e222f7 missed a spot where channel can be out of sync 2013-02-25 09:32:06 +11:00
Sam Saffron
47fedd8f4d correct breakage
don't set permanent cookie, kill session if it conflicts
2013-02-24 22:56:08 +11:00
Sam Saffron
b66db4153d refactor and organise current_user better 2013-02-24 21:42:04 +11:00
Sam Saffron
82e2fae1b8 isolate notifications in channel per user 2013-02-24 10:24:06 +11:00
Jeff Atwood
9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Neil Lalonde
fc33c63585 EmailToken.active needs to check created_at too 2013-02-22 15:20:00 -05:00
Robin Ward
e2fed6fcef Merge pull request #229 from danneu/topic-patch
make topics consume their own scope
2013-02-22 10:59:07 -08:00
Robin Ward
532b1f5450 Can edit category descriptions, they show up in a title attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde
ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Dan Neumann
65b59f8612 make Topic consume its own scope. 2013-02-21 21:22:02 -06:00
Neil Lalonde
8620024798 Show which SHA is installed on the admin dashboard 2013-02-21 13:48:14 -05:00
Robin Ward
42d996aae1 Show empty categories to those who can create them (admins/mods) 2013-02-21 10:43:10 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See:
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
2013-02-20 19:01:13 -05:00
Neil Lalonde
85f8f8f2d5 Better checking of blacklisted emails on create and when email is being updated 2013-02-20 16:25:08 -05:00
Neil Lalonde
046c330858 Changes to email_domains_blacklist shouldn't invalidate existing users 2013-02-20 12:16:16 -05:00
Dan Neumann
37ca391f50 validate category user_id. 2013-02-19 21:24:38 -06:00
Robin Ward
836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward
b7e027cfd1 Notifications on PMs respect access rights. 2013-02-19 12:59:46 -05:00
Robin Ward
ae9bee2a91 Merge pull request #172 from jeremybanks/master
Do not strip leading and trailing whitespace from raw posts
2013-02-19 08:15:39 -08:00
Sam Saffron
d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks
d42782b318 Using LengthValidator's localized messages for StrippedLengthValidator. 2013-02-18 21:57:46 -05:00
Jeremy Banks
eb2a5e4654 Merge branch 'origin/master'
Conflicts:
	lib/text_sentinel.rb
2013-02-18 21:41:20 -05:00
Sam Saffron
d520771c73 move stylesheet cache into the upload dir so its less crazy to sync across servers 2013-02-19 11:02:00 +11:00
Jeremy Banks
6af69f7e77 Do not strip leading and trailing whitespace from raw posts. 2013-02-15 20:58:33 -05:00
Sam
8631a6850b Merge pull request #178 from danneu/update-stats-fix
Category year/month/week stats shouldn't include deleted topics.
2013-02-17 14:00:12 -08:00
Sam
e8b3821b41 Merge pull request #179 from tms/users-like-like-posts
Users like like posts
2013-02-17 13:57:52 -08:00
tms
fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00