Robin Ward
37b4df3009
Merge pull request #1392 from einarj/use_topic_delegators
...
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-29 07:55:35 -07:00
Sam
2c61828668
saving dialog somehow vanished during refactoring
...
better error handling for posts that fail to save
2013-08-29 17:06:27 +10:00
Sam
39a6c25ebb
Merge pull request #1393 from eparreno/cas_authentication
...
Allow CAS authentication
2013-08-28 14:28:59 -07:00
Neil Lalonde
4827634df9
rename application.css.erb to desktop.css.erb
2013-08-28 16:41:05 -04: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
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
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
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
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
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
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
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
83d8bcdc27
revert non queuing of emails
2013-08-27 11:52:28 +10:00
Robin Ward
6c3cb9023c
FIX: Allow backticks in code blocks
2013-08-26 16:53:10 -04:00
Neil Lalonde
3708d47c87
Check daily if there are new users who need to be approved and send a pm to moderators
2013-08-26 16:16:27 -04:00
Neil Lalonde
068a674c39
Handle overflowing values on admin logs pages
2013-08-26 16:16:27 -04:00
Robin Ward
2d45c56ba5
Replace Markdown Linebreak Regexp with node parser.
2013-08-26 15:21:23 -04:00
Robin Ward
373b525ec1
Revert "FIX: New line insertion when a line begins with []"
...
This reverts commit f84630a54d
2013-08-26 12:46:15 -04:00
Neil Lalonde
0ad608abb2
Merge pull request #1384 from einarj/nickname_unavailable_generates_error_json
...
Nickname unavailable generates error json
2013-08-26 08:49:40 -07:00
Robin Ward
f84630a54d
FIX: New line insertion when a line begins with []
2013-08-26 11:42:52 -04:00
Einar Jonsson
9085cec232
Move json hash from users controller to NicknameUnavailable
2013-08-26 15:00:11 +00:00
Sam
ac905d4a08
defer persona init till after people launch the login dialog
2013-08-26 17:51:41 +10:00
Sam
f4bda8f1ba
revert change of defaults for twitter and facebook enabled
2013-08-26 17:36:08 +10:00
Sam
fd6e86483f
strip out css fade-in animation from share dialog, it was only causing trouble. Fixing it is more hassle than it is worth. inivisible elements take height so we constantly need to worry about re-positioning the hidden share dialog.
2013-08-26 16:28:42 +10:00
Sam
0b74c2da9c
fix jittering on click caused by re-positioning of invisible share dialog. it does not use display:none to preserve an animation.
2013-08-26 16:09:30 +10:00
Sam
322b5c236c
queue emails right away if a user is not online, no point waiting.
2013-08-26 14:55:35 +10:00
Sam
afd1a3ac7b
yeah ... we should be installing the gem :)
2013-08-26 13:52:15 +10:00
Sam
818bf1355d
PluginStore for plugin specific bits of storage
...
Amended plugin interfaces so they work with the vk sample
2013-08-26 12:59:17 +10:00
Sam
213ce33af2
Fixed all broken specs
...
Moved middleware config into authenticators
2013-08-26 12:59:17 +10:00
Sam
075002a6d5
refactoring the plugin interfaces to allow for better extensible
2013-08-26 12:59:17 +10:00
Sam
2eb55b74e4
twitter and facebook are broken unless configure, so default off please
2013-08-26 12:59:17 +10:00
Sam
b52aba15e0
major refactor of auth, break up the gigantic omniauth controller into sub classes for way better extensibitily
2013-08-26 12:59:17 +10:00
Sam
90dddb4395
store honeypot challenge in redis for extra security
2013-08-26 12:55:13 +10:00
Sam
011d3cf779
minor style change
2013-08-26 12:55:13 +10:00
Sam
c4a2e62a95
Merge pull request #1378 from justin808/justin808_cc
...
Lower Complexity of UsersController
2013-08-25 17:14:39 -07:00
Sam
f87ba0d88f
Merge pull request #1381 from einarj/test_nickname_hub_registration_failure
...
Added test case for nickname registration failure
2013-08-25 17:12:52 -07:00
Sam
e0c99196a8
Merge pull request #1383 from ZogStriP/add-max-image-height-site-setting
...
add max_image_height site setting
2013-08-25 17:11:48 -07:00
Sam
3cffdb5a65
Merge pull request #1382 from novemberkilo/master
...
No more rails 4 deprecation warnings
2013-08-25 17:09:49 -07:00
Régis Hanol
32f717420d
add max_image_height site setting
2013-08-26 00:24:24 +02:00
Navin Keswani
d87389b38e
No more rails 4 deprecation warnings
2013-08-25 23:18:11 +02:00
Einar Jonsson
0d22a77c63
Added test case for nickname registration failure
...
* Also made a minor readability change by moving the auth.present? check
* from UsersController#create into #create_third_party_auth_records
* which is the method that relies on the check.
2013-08-25 20:18:07 +00:00
Régis Hanol
fd7fd22932
FIX: changing another user's avatar changes yours
2013-08-25 17:33:43 +02:00
Robin Ward
b32e87c929
Merge pull request #1377 from ZogStriP/avatar-work
...
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
Robin Ward
b74754e673
Merge pull request #1371 from einarj/cleanup_user_registration
...
Extracted nickname registration into a private controller method
2013-08-25 07:30:10 -07:00
Robin Ward
e1efde6707
Merge pull request #1376 from gcapizzi/lists_controller_refactoring
...
ListController refactoring
2013-08-25 07:29:35 -07:00
Justin Gordon
464595df5c
Lower Complexity of UsersController
...
https://codeclimate.com/github/discourse/discourse/UsersController#method-complexity
2013-08-24 22:57:12 -10:00
Régis Hanol
4c788e75f0
add a warning whenever the uploaded image is not a square
2013-08-25 00:25:47 +02:00
Robin Ward
c0b051c9f6
Show Private Messages pill as a topic list rather than individual messages.
2013-08-24 16:58:16 -04:00
Régis Hanol
3b9e62e6b9
improved specs for avatar
2013-08-24 22:45:05 +02:00
Robin Ward
20e8a8a38a
FIX: Don't onebox @mentions
2013-08-24 15:01:00 -04:00
Giuseppe Capizzi
6f19cb7252
Extract ListController#list_target_user
2013-08-24 19:38:02 +02:00
Robin Ward
5e286443a8
FIX: Code blocks were trimming leading spaces sometimes when they should have only
...
trimmed trailing spaces.
2013-08-24 13:24:27 -04:00
Robin Ward
093ead7855
Support for ***bold and italics***
2013-08-24 13:06:07 -04:00
Robin Ward
e9663e5338
Merge pull request #1332 from locks/user_email_observer
...
User email observer (Code Climate improvements)
2013-08-24 08:34:11 -07:00
Robin Ward
08762f5666
Merge pull request #1369 from voisintotoro/voisintotoro-branch
...
PNG Files optimization
2013-08-24 08:32:15 -07:00
Ricardo Mendes
37f4022f73
Refactors UserEmailObserver to improve Code Climate score
...
- Extracts certain logic to private methods and remove unnecessary
comments
- Extracts email enqueueing methods into a separate class
- Fix specs involving UserEmailObserver to call #after_commit instead
of the specific methods
2013-08-24 12:21:39 +01:00
Jeff Atwood
edbaafdd7b
default relative dates to 30 days vs 14
2013-08-23 23:28:51 -07:00
Neil Lalonde
6e79197519
Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency.
2013-08-23 17:36:25 -04:00
Régis Hanol
43a8bff652
add a site setting for allowing animated avatars
2013-08-23 18:55:02 +02:00
Neil Lalonde
6a3c849067
Fix [object Object] in staff logs details modal
2013-08-23 10:08:35 -04:00
Jeff Atwood
f36fc8c41f
remove unnecessary onebox body padding
2013-08-23 02:53:14 -07:00
Jeff Atwood
5cf0c59628
remove onebox info left padding
2013-08-23 02:48:55 -07:00
Einar Jonsson
84987cd835
Extracted nickname registration into a private controller method
2013-08-23 09:46:33 +00:00
Sam
472f0684c3
Merge pull request #1345 from salbertson/refactor-find_by_username_or_email
...
Improve test coverage and refactor User.find_by_username_or_email
2013-08-22 17:14:06 -07:00
Neil Lalonde
3b15e2e58e
Banned users are not returned as pending review users
2013-08-22 19:23:49 -04:00
Neil Lalonde
25e0c3eac1
Log IP addresses with screened emails and urls
2013-08-22 19:04:35 -04:00
Robin Ward
612c0ccccb
FIX: Autolinking within a list
2013-08-22 18:03:01 -04:00
Robin Ward
513f941f50
Fixes @mentions inside of lists
2013-08-22 17:50:36 -04:00
Neil Lalonde
86012ac579
Fix a case when the wrong topic is loaded because the slug starts with a number
2013-08-22 16:23:46 -04:00
Robin Ward
f2c4b3e37f
FIX: Following a mention with a coded mention.
2013-08-22 16:13:02 -04:00
Robin Ward
6fe0d29a01
FIX: @mentions within backticks followed by proper @mentions.
2013-08-22 15:55:29 -04:00
Robin Ward
5e50c4624f
FIX: New lines in code blocks were somewhat unpredictable
2013-08-22 13:46:51 -04:00
Scott Albertson
1dbe1fb1bc
Refactor User.find_by_username_or_email
...
* Improve test coverage
2013-08-22 09:40:07 -07:00
Robin Ward
0f27232711
FIX: Support inline code blocks with @mentions in them.
2013-08-22 12:18:36 -04:00
Neil Lalonde
24617dd776
Show empty categories with descriptions to everyone
2013-08-22 11:55:20 -04:00
voisintotoro
1983da14c3
PNG Files optimization
2013-08-22 14:00:25 +02:00
Robin Ward
ae93fcebde
FIX: Autolines were duplicating some text
2013-08-21 22:49:55 -04:00
Robin Ward
a3757016d9
FIX: Quotes with new lines were broken
2013-08-21 22:36:02 -04:00
Sam
d7596840e5
only staff should be able to see bookmarks and favs of other users
...
ensure that when they click on them they see the correct topics (topics for user they are looking at, not current user)
2013-08-22 09:18:54 +10:00
Neil Lalonde
adbb6a19bb
Fix 'You must choose a category' when a category is already chosen
2013-08-21 16:14:22 -04:00
Robin Ward
30cfa33629
FIX: @mentions within simple quotes
2013-08-21 16:10:16 -04:00
Neil Lalonde
e5464a4bed
Show staff action log details in a modal
2013-08-21 12:33:24 -04:00
Neil Lalonde
47add6da70
Log when a site customization is deleted
2013-08-21 12:33:24 -04:00
Neil Lalonde
a95303fcd8
Log site customization changes. Use a modal to show staff action log details for site customizations.
2013-08-21 12:33:24 -04:00
Robin Ward
7f69a58439
Replace Markdown parser.
2013-08-21 10:10:57 -04:00
Robin Ward
3760cba549
Merge pull request #1366 from ZogStriP/do-not-disable-the-radio-button
...
do not disable the radio button in the avatar selection modal
2013-08-21 07:09:58 -07:00
Einar Jonsson
916a3f33f2
Refactored user activation business logic out of UsersController and
...
into a UserActivator class.
2013-08-21 09:22:34 +00:00
Sam
8a0a097dfb
make message bus more robust to bad inputs, correct issue where notifications channel is not susbcribed
2013-08-21 09:07:38 +10:00
Sam
487788b65b
correct missing progress bar on navigation to new topic.
2013-08-21 08:37:30 +10:00
Robin Ward
7546a29d10
FIX: After sharing links and navigating long topics sometimes you'd have a lot of blank space.
2013-08-20 18:04:40 -04:00
Régis Hanol
9204e0f420
do not disable the radio button in the avatar selection modal
2013-08-20 22:54:01 +02:00
Régis Hanol
dcfe4f2061
remove useless text beneath avatar
2013-08-20 21:53:17 +02:00
Neil Lalonde
3abeb5f793
Staff action logs can be filtered to changes of one site setting
2013-08-20 13:50:51 -04:00
Sam
c0c929be5a
optimise query that runs every 10 minutes and takes out the user table
2013-08-20 17:40:22 +10:00
Sam
f4d833da27
fix onebox exception, if oneboxes fail on save we log a warning to the log
2013-08-20 11:38:10 +10:00
Sam
d43bd55e5b
HACK: hold back on loading more topics for a bit while we are repositioning the page for Safari
2013-08-20 11:25:15 +10:00
Sam
341a28402d
speed up scrolling on android
2013-08-20 11:25:15 +10:00
Jeff Atwood
58b7df5480
change edit to std pencil glyph on avatars
2013-08-19 15:07:48 -07:00
Sam
dca0b6b9b8
Merge pull request #1358 from chrishunt/bump-favcount
...
Improve readability of count for complex favicons
2013-08-19 14:58:57 -07:00
Sam
60c740e16e
Merge pull request #1361 from ZogStriP/fix-css-on-image-in-preview
...
FIX: images in the preview have rounded corners
2013-08-19 14:58:02 -07:00
Sam
df2b0b47bd
Merge pull request #1360 from michaelkirk/feature/oauth2
...
not recording Oauth2 user email
2013-08-19 14:57:05 -07:00
Régis Hanol
8107170f08
FIX: images in the preview have rounded corners
2013-08-19 23:45:55 +02:00
Neil Lalonde
1d030666d8
Log site setting changes and show in admin
2013-08-19 16:58:38 -04:00
Michael Kirk
9e8d8870f5
fixed: record Oauth2 user email
2013-08-19 11:21:27 -07:00
Neil Lalonde
3cc8354fe2
Don't trust topic title in template until it has been sanitized by the server
2013-08-19 14:19:59 -04:00
Neil Lalonde
7eaedb84e1
Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked
2013-08-19 12:00:48 -04:00
Chris Hunt
53f011e89e
Bump to favcount v1.1.0
2013-08-19 08:55:38 -07:00
Sam
a9393e4a7a
paging for flag list
...
corrected reload behavior on flag list
refactored post actions ... extracted flag queries
2013-08-19 21:14:26 +10:00
Viktor Palmkvist
f8129c4e43
Make the composer and TopicCreator use category id instead of category name
...
Also fixes #1171
2013-08-19 11:57:35 +02:00
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
