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
Sam Saffron
3be7bde401
stop onebox rapid fire
2013-02-19 10:33:07 +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
Dan Neumann
fac75401ef
category stats shouldn't include deleted topics.
2013-02-16 21:10:18 -06:00
Robin Ward
7f4ee00228
Merge pull request #170 from alxndr/remove-iconv-100
...
Removes iconv dependency
2013-02-16 13:01:09 -08:00
Robin Ward
b440e30f45
Better filtering out private messages on user stream.
2013-02-15 17:08:28 -05:00
Alexander
6c4ae05454
Removes iconv dependency
...
Fixes #100
2013-02-15 13:36:19 -08:00
Robin Ward
3cdf89d052
Merge pull request #162 from jessepollak/omniauth-failure
...
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Jesse Pollak
ad5a5b4866
This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml
2013-02-14 18:08:40 -08:00
Sam Saffron
a8085f15c4
grab highest post number from the raw data, so deletions at the end of a topic work
2013-02-15 13:08:37 +11:00
Sam
5628bac5c3
Merge pull request #164 from danneu/slug-fix
...
slug should replace underscores
2013-02-14 17:24:36 -08:00
Sam Saffron
6c73b3a971
bookmarks should only show up in a users stream
2013-02-15 11:44:14 +11:00
Dan Neumann
44642d4d0c
slug should replace underscores
2013-02-14 17:04:30 -06:00
Robin Ward
37b0c168bf
Support non-english topic titles
2013-02-14 17:13:03 -05:00
Robin Ward
5d4efa9100
Support for non-english categories
2013-02-14 16:51:48 -05:00
Robin Ward
d740d7b25f
Fix for foreign language titles: Only enforce upper case rule on english alphabet.
2013-02-14 16:09:57 -05:00
Robin Ward
b9457197c0
First stab at new user education - configurable messages that pop up on a user's first
...
few posts/topics.
2013-02-14 15:33:51 -05:00
Neil Lalonde
39eab7c425
Replace mentions of mothership with discourse_hub
2013-02-14 12:57:26 -05:00
Robin Ward
cba4c9051a
Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri
...
Replace hpricot with nokogiri
2013-02-14 07:55:19 -08:00
Robin Ward
b94b9d2383
Merge pull request #146 from ismaelga/moderators-buttons
...
Create moderators
2013-02-14 07:26:50 -08:00
Jaime Iniesta
e4c1b9702b
Use FakeWeb to fake web requests on specs
2013-02-14 11:35:50 +01:00
Jaime Iniesta
6995e75d41
Replace Hpricot with Nokogiri
2013-02-14 11:35:50 +01:00
Jaime Iniesta
84a167725d
Add specs for oneboxer components: amazon, android, apple, flickr and wikipedia
2013-02-14 11:34:33 +01:00
Sam Saffron
87d83802b9
added option that allows users to decide when they consider topics new (default 2 days old or newer)
...
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Neil Lalonde
aaf96f1e29
Replace email_blacklist_regexp with email_domains_blacklist site setting
2013-02-13 22:45:43 -05:00
Ismael Abreu
80bec6efc9
Adds grant and revoke moderation buttons so admins can make users moderators
2013-02-14 01:12:23 +00:00
Robin Ward
dee9e9a51f
Fix bug where links to posts weren't being tracked
2013-02-13 15:23:09 -05:00
Neil Lalonde
941820ac88
Client-side email validation should allow capital letters
2013-02-13 14:30:00 -05:00
Robin Ward
f00006ee7d
Fix broken Yahoo! signup.
2013-02-13 12:37:48 -05:00
Neil Lalonde
f850fe1e75
Implement the email_blacklist_regexp ssite setting
2013-02-13 12:28:39 -05:00
Robin Ward
a9da9c5fde
Merge pull request #148 from danneu/slug-simplify
...
replace reinvention of #parameterize
2013-02-13 07:23:26 -08:00
Robin Ward
afc23cc8cb
Merge pull request #133 from xdite/apply_omniauth
...
Apply omniauth
2013-02-13 07:19:13 -08:00
Sam Saffron
161420fac0
Added method for testing ember stuff
...
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
xdite
a7908e07d1
merge master
2013-02-13 15:16:39 +08:00
xdite
f232c646a7
move 3 test to 1
2013-02-13 15:15:44 +08:00
Robin Ward
27a07054d7
We never want to filter TopicView to just one post.
2013-02-12 19:02:16 -05:00
Dan Neumann
4a390bc562
remove reinvention of #parameterize
2013-02-12 17:53:06 -06:00
Neil Lalonde
824b09389f
Don't allow signups without a password
2013-02-12 15:42:16 -05:00
Robin Ward
924ad1dae0
Merge pull request #106 from gammons/master
...
Refactored TopicsController#show into something that is much more maintainable
2013-02-12 08:36:20 -08:00
Neil Lalonde
4636b354b4
Use the new mothership change_nickname API
2013-02-12 10:19:02 -05:00
Neil Lalonde
238032051e
Users with no email_tokens return true from email_confirmed
2013-02-12 10:19:02 -05:00
Sam Saffron
925925817f
remove old buggy code see: http://meta.discourse.org/t/quoted-you-emails/2226/3
...
notify by display name is silly, display name is not unique in the system
2013-02-12 18:49:57 +11:00
Sam Saffron
99526c33da
emoji should not be coupled into the core
...
avatars were being counted and should not have been for basic users
2013-02-12 18:43:48 +11:00
Sam
6e74b4fb0c
Merge pull request #130 from danneu/slug-refactoring
...
Lean on Inflector for slug transliteration.
2013-02-11 19:31:16 -08:00
Sam Saffron
ad88487a32
Merge branch 'master' of github.com:discourse/discourse
2013-02-12 13:45:24 +11:00
Sam Saffron
2b276bc2c8
gist oneboxer issues
2013-02-12 13:45:08 +11:00
Dan Neumann
50cf8cd4d5
Set up slug.rb for obvious method extractions.
2013-02-11 20:36:54 -06:00
Dan Neumann
9daf53df73
lean on Inflector transliteration
2013-02-11 20:34:38 -06:00
