Commit graph

4448 commits

Author SHA1 Message Date
Robin Ward
522c60c81a FIX: Error loading up V8 due to Discourse not being present 2013-08-28 18:28:25 -04:00
Sam
39a6c25ebb Merge pull request #1393 from eparreno/cas_authentication
Allow CAS authentication
2013-08-28 14:28:59 -07:00
Robin Ward
548904fbf7 Merge pull request #1396 from ZogStriP/fix-migration
properly escape backslashes
2013-08-28 14:25:20 -07:00
Régis Hanol
86d2477f97 properly escape backslashes 2013-08-28 23:21:46 +02:00
Neil Lalonde
4827634df9 rename application.css.erb to desktop.css.erb 2013-08-28 16:41:05 -04:00
Robin Ward
28ff921ba2 Merge pull request #1395 from ZogStriP/fix-sh-convert-error-in-test
FIX: convert error in test
2013-08-28 13:23:36 -07:00
Robin Ward
ea16123b85 Merge pull request #1394 from ZogStriP/fix-thumbnails
FIX: 404 on old thumbnails
2013-08-28 13:23:16 -07:00
Robin Ward
6029a77efb A nicer API for dealing with text replacements in Discourse's parser pipeline 2013-08-28 16:15:50 -04:00
Régis Hanol
e15982a476 FIX: convert error in test 2013-08-28 22:06:09 +02:00
Neil Lalonde
2b2c83ffb7 remove console.log 2013-08-28 15:53:42 -04:00
Neil Lalonde
c2088f5b5d Use moment.js in auto close js 2013-08-28 15:37:39 -04:00
Régis Hanol
027af77741 FIX: 404 on old thumbnails 2013-08-28 21:29:45 +02:00
Robin Ward
eeef24b9da Allow basic emoticons to work too. 2013-08-28 15:27:03 -04:00
Neil Lalonde
e3aafc154b Restructure the app/assets/stylesheets directory 2013-08-28 13:58:44 -04:00
Robin Ward
af18cc87fd Better documentation for new Dialect helpers. Migrated emoticon support to new helper format. 2013-08-28 13:55:08 -04:00
Robin Ward
550ef104c6 FIX: Markdown references within a list were not working properly. 2013-08-28 13:06:41 -04:00
Robin Ward
f7ad80ff7b A couple of important markdown fixes. 2013-08-28 11:14:31 -04:00
Neil Lalonde
f611a5d898 If min entropy setting is greater than min post/body length setting, then use a sensible min entropy value instead 2013-08-28 11:04:28 -04:00
Emili Parreno
ee96fabcba Allow CAS authentication 2013-08-28 14:34:51 +02:00
Einar Jonsson
3ed037940f Replaced delegator methods with Forwardable def_delegator in Topic 2013-08-28 11:25:57 +00:00
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10:00
Sam
28466eb5b2 group the "suggested topics" by category correctly.
in the past new topics were not prioritizing current category and
new topics in a category were not being inserted before other unread topics
in other categories
2013-08-28 10:52:06 +10:00
Sam
c0f610daf6 digest interfaces returning empty objects (except for id) interface needed correction 2013-08-28 10:52:06 +10:00
Sam
b6028c39d7 user simulator was bust 2013-08-28 10:52:06 +10:00
Sam
dfa5a8a83f annotate models 2013-08-28 10:52:06 +10:00
Robin Ward
8f94760cd4 Better API for adding on to our Dialect 2013-08-27 18:17:34 -04:00
Robin Ward
92d7953dd0 Merge pull request #1391 from ZogStriP/fix-avatar-thumbnail-wont-save-after-upload
FIX: avatar thumbnail won't save after upload
2013-08-27 14:58:48 -07:00
Régis Hanol
96772af35b FIX: avatar thumbnail won't save after upload 2013-08-27 23:01:35 +02:00
Neil Lalonde
b84c7e4efb Store mobile flag in Discourse.Session instead of Discourse 2013-08-27 16:50:50 -04:00
Neil Lalonde
3cfc9a7bba Create a mobile css manifest 2013-08-27 16:40:30 -04:00
Neil Lalonde
9efa29e688 Detect whether to use mobile view. Session var mobile_view can override automatic detection. 2013-08-27 14:57:42 -04:00
Neil Lalonde
009dec833f Use Discourse.Resolver to load mobile templates when they exist 2013-08-27 13:41:36 -04:00
Robin Ward
73489b652e FIX: Allow intra-word underscores. 2013-08-27 12:25:05 -04:00
Neil Lalonde
89265c3a8b FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything. 2013-08-27 11:31:14 -04:00
Robin Ward
07328e5e4b FIX: Navigating to a new topic after editing one was leaving edit controls open. 2013-08-27 11:29:30 -04:00
Robin Ward
90fef936dc Merge pull request #1389 from einarj/extract_featured_users
Extracted featured_users functionality out of Topic.
2013-08-27 06:58:19 -07:00
Robin Ward
0f6c2060b8 Merge pull request #1388 from ofgeek/patch-2
Update client.zh_CN.yml
2013-08-27 06:56:20 -07:00
Einar Jonsson
b385cdcc34 Extracted featured_users functionality out of Topic.
* Created a TopicFeatureUsers model
* Topic#featured_user_ids and Topic#feature_topic_users now delegate to
* a TopicFeatureUsers instance to keep demeter happy.
2013-08-27 09:10:50 +00:00
ofGEEK
79ddb162b6 Update client.zh_CN.yml 2013-08-27 15:33:26 +08:00
ofGEEK
85a948d5b4 Update client.zh_CN.yml 2013-08-27 15:21:20 +08:00
Sam
7787770758 leftover console.log
jshint is upset
2013-08-27 16:02:36 +10:00
Sam
c4a0152dc6 recover from bad CSRF tokens without requiring a hard refresh of the browser 2013-08-27 15:56:12 +10:00
Sam
bec463564f BUGFIX: When running under a forking server (apache or unicorn) openid strategy was caching a redis connection from the parent, this made "login with google" only work some of the time. 2013-08-27 14:44:06 +10:00
Sam
83d8bcdc27 revert non queuing of emails 2013-08-27 11:52:28 +10:00
Sam
a418a7c5e6 upgrade rails 4 2013-08-27 11:52:28 +10:00
Sam
89ce39c902 Merge pull request #1386 from Andersos/patch-1
added quotes
2013-08-26 18:45:06 -07:00
Robin Ward
29385f4898 Merge pull request #1387 from ZogStriP/fix-schemaless-urls-in-emails
FIX: schemaless urls in emails
2013-08-26 15:15:00 -07:00
Régis Hanol
561792a615 FIX: schemaless urls in emails 2013-08-27 00:08:38 +02:00
Robin Ward
6c3cb9023c FIX: Allow backticks in code blocks 2013-08-26 16:53:10 -04:00
Robin Ward
1c3c468675 FIX: Single quotes in search terms would raise an error. 2013-08-26 16:25:54 -04:00