bded4b26fa
Ask admins to fill in site_description on the dashboard, and send it to the hub
2013-09-11 16:32:49 -04:00
4fa11f159f
Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO
2013-09-11 15:33:27 -04:00
06ea8140aa
New job (default off) to detect whether users have uploaded custom avatars by contacting Gravatar.
2013-09-11 15:14:18 -04:00
fcff4e80d1
New `user_stats` table to keep track of queried information on a user.
...
This is information that is not usually needed when representing a user
and is in a separate table with a has one relationship to avoid querying
it all the time.
2013-09-11 14:50:26 -04:00
fe3693cdef
Merge branch 'master' of github.com:discourse/discourse
2013-09-11 10:20:27 -04:00
def4f15795
Merge pull request #1427 from awesomerobot/master
...
Reducing margins on mobile view
2013-09-11 00:36:57 -07:00
e26b3662ee
drafts were saving but client was failing to parse
2013-09-11 16:18:46 +10:00
efb15af209
not needed, already in private section
2013-09-11 16:18:17 +10:00
8516059025
remove global check
2013-09-11 15:58:55 +10:00
a8bc789b81
reducing margins on mobile
2013-09-10 23:56:55 -04:00
681ff74cb8
Revert "inject currentUser into controllers & routes"
...
This reverts commit 7ec34b205a
2013-09-11 13:26:46 +10:00
e8ef55c446
Rename StaffActionLog to UserHistory
2013-09-10 22:01:20 -04:00
e420ce3da3
fix regression, 2 people liked this text not expanding correctly
2013-09-11 11:24:42 +10:00
30eed4c8b4
FIX: Showing suggested topics when composing a reply
2013-09-10 20:00:04 -04:00
f2a1ef8d7d
FIX: When expanding embedded replies, adjust the scroll position to not lose your place
2013-09-10 17:15:07 -04:00
cc2acafc9a
Enable mobile view. Use local storage to remember whether you chose mobile or desktop view. Mobile device detection needs to be replaced with a better solution.
2013-09-10 16:44:17 -04:00
2319924206
Adds a class that can detect whether a user has uploaded a custom avatar
2013-09-10 15:39:11 -04:00
886787b157
Remove extra comma
2013-09-10 12:31:58 -04:00
0de96a6059
Adds support for dynamic composer messages.
2013-09-10 12:30:56 -04:00
bcf0203497
fix encoding bug
2013-09-10 16:01:36 +10:00
162d94aa02
improve secure_category_id query
2013-09-10 14:29:02 +10:00
df5f9d66e5
bugfix: when expanding "1 person flagged for moderation" target post is not clickable
2013-09-10 09:51:33 +10:00
78c15d5810
Move the unique post key storage code into the Post model
2013-09-09 16:17:31 -04:00
48ee89940e
Merge pull request #1423 from einarj/nickname_registration_service
...
Nickname registration service object
2013-09-09 11:37:56 -07:00
84a8a358c3
Trivial: Rename dialect action to block quotes rather than simple quotes
2013-09-09 14:11:56 -04:00
49910b860b
FIX: Regression that removed the ability to quote code
2013-09-09 13:20:03 -04:00
199584824b
Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users)
2013-09-09 12:24:26 -04:00
360b8e32ca
Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file
...
staff can always upload a file
2013-09-09 08:55:47 -07:00
fc4f5a36c6
Merge pull request #1418 from goshakkk/inject-current-user
...
Inject currentUser into controllers & routes
2013-09-09 08:54:34 -07:00
b73f4e9864
Put category description in meta description tag
2013-09-09 11:38:09 -04:00
724b3aadcf
Extracted nickname registration out of the UsersController and into its
...
own service.
2013-09-09 09:26:50 +00:00
7ec34b205a
inject currentUser into controllers & routes
...
Through Ember's DI, instead of doing so via a mixin.
2013-09-07 19:34:25 +03:00
eae30d7816
staff can always upload a file
2013-09-07 10:49:11 +02:00
b87a78f7b2
Merge branch 'master' of github.com:discourse/discourse
2013-09-06 18:01:33 -04:00
c8ad977c8a
Revert "Merge pull request #1215 from Elegios/composer_use_category_id"
...
This reverts commit 763859d439b62caf80fb
2013-09-06 18:00:57 -04:00
2ea6a61a17
Show post number in the share dialog
2013-09-06 17:34:31 -04:00
a9f3489237
FIX: Don't onebox links with labels unless the labels are the same as the URL
2013-09-06 16:47:26 -04:00
94917f47ed
Remove brackets from `username_filters[]` URL
2013-09-06 15:58:54 -04:00
eef34eea80
Fix IE9 bug in browser-update. Unable to get value of the property 'insertBefore': object is null or undefined
2013-09-06 14:57:26 -04:00
763859d439
Merge pull request #1215 from Elegios/composer_use_category_id
...
Make the composer and TopicCreator use category id instead of category name
2013-09-06 11:55:27 -07:00
b62caf80fb
Merge pull request #1402 from LaunchAcademy/fix_index_out_of_range_error
...
FIX: Index out of range error
2013-09-06 11:53:59 -07:00
45b838009c
proper content-disposition header when downloading attachments
2013-09-06 19:23:56 +02:00
eae7e75611
FIX: recover post by a non-staff user fails because the post is not unique. Uniqueness check shouldn't happen when recovering a deleted post.
2013-09-06 11:50:15 -04:00
641c51367a
fix broken build
...
hack to allow for PMs with no users for flagging needs
2013-09-06 18:03:30 +10:00
32e3e3f382
update annotations
2013-09-06 17:38:50 +10:00
2ce4468aa5
rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks
...
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
2013-09-06 17:28:37 +10:00
41a1b6942d
notify moderators now goes to the "community" user, that saves our poor mods from a flood of pms
...
if any staff respond to a pm they are automatically added to the list of recipients and will start
getting email notifications
2013-09-06 14:07:23 +10:00
cbe38075ac
Fix asset compile problems
2013-09-05 18:04:45 -04:00
63be950e5f
FIX: Quotes inside a list
2013-09-05 17:04:01 -04:00
f47400fe2d
Make post body have font-size 14px again
2013-09-05 16:45:38 -04:00
9b526364ed
Merge branch 'mobile'
2013-09-05 16:29:27 -04:00
66d1cacdbd
Hide flag modal while flag is submitted
2013-09-05 16:29:13 -04:00
a3f3b086f3
Don't show mobile view unless mobile_view=1 param is used. Still more work to do.
2013-09-05 16:28:57 -04:00
c0b3a0ec45
Merge .deleted-user-avatar into mobile topic-post
2013-09-05 16:28:16 -04:00
38fb727c00
JSHINT: missing comma
2013-09-05 16:05:04 -04:00
17585c7152
Merge branch 'mobile' of https://github.com/awesomerobot/discourse into mobile
2013-09-05 16:03:06 -04:00
45d7765936
Merge branch 'master' into mobile
2013-09-05 15:54:22 -04:00
2d6759d5a0
Add cancel button to delete replies dialog
2013-09-05 15:54:16 -04:00
b8493b024b
adding missing files back in
2013-09-05 15:37:07 -04:00
c2f37d36ab
Hide flag modal while flag is submitted
2013-09-05 15:14:07 -04:00
80c4e02335
new mobile styles, some structure changes
2013-09-05 12:09:40 -04:00
cde631cbd1
Change default of notify_mods_when_user_blocked to false
2013-09-05 11:27:24 -04:00
71c1b8b9b9
When deleting a post as staff, ask if you want to delete direct replies too
2013-09-05 11:03:34 -04:00
f157ec1f91
Select +Replies for bulk operations
2013-09-05 11:03:29 -04:00
c9321cae7f
Our JS includes belong at the top of the file, that way we can start
...
downloading and parsing them earlier and not wait for the rest of the page
Our noscript stuff belongs at the bottom, we should not hold off any js work
while noscript is downloading
2013-09-05 10:41:11 +10:00
d76486a48b
Topic can have null user_id when user was nuked
2013-09-04 15:42:24 -04:00
117fc8db58
Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream.
2013-09-04 15:42:21 -04:00
1a6170a47c
Merge pull request #1407 from einarj/extract_fake_admin_method
...
Extracted a fake_admin method
2013-09-04 07:59:03 -07:00
61d3e43744
better split logic for names starting with capitols eg: ABBob should split to AB Bob
2013-09-04 15:02:04 +10:00
b47eedba00
Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics
2013-09-03 19:12:22 -04:00
dc1efd6c78
If mobile view, don't switch to small logo in the header when scrolled down in a topic
2013-09-02 16:26:12 -04:00
07e6956917
Restructure login form for mobile
2013-09-02 16:02:52 -04:00
1fa6144067
Add span.btn-text around 'Reply' text in the post menu
2013-09-02 15:55:35 -04:00
e06356ebbe
Extracted a fake_admin method
2013-08-30 17:39:31 +00:00
46efbac40e
Add "Unread" filter to messages tab. Rename the other two views.
2013-08-30 12:32:05 -04:00
232f5bd743
Merge pull request #1403 from einarj/use_topic_delegators
...
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-30 08:15:10 -07:00
63f2187d72
FIX: Don't do intraword italics when prefixed by a forward slash
2013-08-30 10:56:41 -04:00
df5cbf76e0
Move `insideGroup` into the helper, not the class for grouped each
2013-08-30 10:44:34 -04:00
23d8f5fec7
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-30 09:29:34 +00:00
b70a38f485
FIX: Index out of range error
...
Fixes 'index out of range error' that occurs when viewing a user's
profile page when they haven't yet posted a reply or created a topic
and is @mentioned in a topic.
2013-08-30 00:43:54 -04:00
82bc6b677f
Add link in hamburger menu to switch between mobile and desktop views
2013-08-29 15:19:28 -04:00
380a6c9e9d
FIX: Blockquotes prefixed by spaces
2013-08-29 15:18:27 -04:00
c99cf64d70
FIX: Quoting within code blocks.
2013-08-29 14:42:31 -04:00
1204eb62c3
FIX: Escape contents when using the quote tool.
2013-08-29 14:15:05 -04:00
45b9f8048a
Documentation update to dialect
2013-08-29 13:59:41 -04:00
eb5830f3b0
FIX: Make `getURL` available to plugins while they are starting up in a similar load order
...
to the client app.
2013-08-29 13:11:12 -04:00
425b59d381
FIX: Don't name two routes the same. It breaks in Ember RC8.
2013-08-29 12:26:05 -04:00
3cec95a2c3
Better API for parsing out blocks in the parser.
2013-08-29 11:47:44 -04:00
bbd79aafd1
Revert "Replaced delegator methods with Forwardable def_delegator in Topic"
...
This reverts commit 3ed037940f
2013-08-29 11:45:27 -04:00
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
2c61828668
saving dialog somehow vanished during refactoring
...
better error handling for posts that fail to save
2013-08-29 17:06:27 +10:00
39a6c25ebb
Merge pull request #1393 from eparreno/cas_authentication
...
Allow CAS authentication
2013-08-28 14:28:59 -07:00
4827634df9
rename application.css.erb to desktop.css.erb
2013-08-28 16:41:05 -04:00
6029a77efb
A nicer API for dealing with text replacements in Discourse's parser pipeline
2013-08-28 16:15:50 -04:00
2b2c83ffb7
remove console.log
2013-08-28 15:53:42 -04:00
c2088f5b5d
Use moment.js in auto close js
2013-08-28 15:37:39 -04:00
eeef24b9da
Allow basic emoticons to work too.
2013-08-28 15:27:03 -04:00
e3aafc154b
Restructure the app/assets/stylesheets directory
2013-08-28 13:58:44 -04:00
af18cc87fd
Better documentation for new Dialect helpers. Migrated emoticon support to new helper format.
2013-08-28 13:55:08 -04:00
550ef104c6
FIX: Markdown references within a list were not working properly.
2013-08-28 13:06:41 -04:00
f7ad80ff7b
A couple of important markdown fixes.
2013-08-28 11:14:31 -04:00
ee96fabcba
Allow CAS authentication
2013-08-28 14:34:51 +02:00
3ed037940f
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-28 11:25:57 +00:00
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
dfa5a8a83f
annotate models
2013-08-28 10:52:06 +10:00
8f94760cd4
Better API for adding on to our Dialect
2013-08-27 18:17:34 -04:00
96772af35b
FIX: avatar thumbnail won't save after upload
2013-08-27 23:01:35 +02:00
b84c7e4efb
Store mobile flag in Discourse.Session instead of Discourse
2013-08-27 16:50:50 -04:00
3cfc9a7bba
Create a mobile css manifest
2013-08-27 16:40:30 -04:00
9efa29e688
Detect whether to use mobile view. Session var mobile_view can override automatic detection.
2013-08-27 14:57:42 -04:00
009dec833f
Use Discourse.Resolver to load mobile templates when they exist
2013-08-27 13:41:36 -04:00
73489b652e
FIX: Allow intra-word underscores.
2013-08-27 12:25:05 -04:00
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
07328e5e4b
FIX: Navigating to a new topic after editing one was leaving edit controls open.
2013-08-27 11:29:30 -04:00
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
7787770758
leftover console.log
...
jshint is upset
2013-08-27 16:02:36 +10:00
c4a0152dc6
recover from bad CSRF tokens without requiring a hard refresh of the browser
2013-08-27 15:56:12 +10:00
83d8bcdc27
revert non queuing of emails
2013-08-27 11:52:28 +10:00
6c3cb9023c
FIX: Allow backticks in code blocks
2013-08-26 16:53:10 -04:00
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
068a674c39
Handle overflowing values on admin logs pages
2013-08-26 16:16:27 -04:00
2d45c56ba5
Replace Markdown Linebreak Regexp with node parser.
2013-08-26 15:21:23 -04:00
373b525ec1
Revert "FIX: New line insertion when a line begins with []"
...
This reverts commit f84630a54d
2013-08-26 12:46:15 -04:00
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
f84630a54d
FIX: New line insertion when a line begins with []
2013-08-26 11:42:52 -04:00
9085cec232
Move json hash from users controller to NicknameUnavailable
2013-08-26 15:00:11 +00:00
ac905d4a08
defer persona init till after people launch the login dialog
2013-08-26 17:51:41 +10:00
f4bda8f1ba
revert change of defaults for twitter and facebook enabled
2013-08-26 17:36:08 +10:00
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
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
322b5c236c
queue emails right away if a user is not online, no point waiting.
2013-08-26 14:55:35 +10:00
afd1a3ac7b
yeah ... we should be installing the gem :)
2013-08-26 13:52:15 +10:00
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
213ce33af2
Fixed all broken specs
...
Moved middleware config into authenticators
2013-08-26 12:59:17 +10:00
075002a6d5
refactoring the plugin interfaces to allow for better extensible
2013-08-26 12:59:17 +10:00
2eb55b74e4
twitter and facebook are broken unless configure, so default off please
2013-08-26 12:59:17 +10:00
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
90dddb4395
store honeypot challenge in redis for extra security
2013-08-26 12:55:13 +10:00
011d3cf779
minor style change
2013-08-26 12:55:13 +10:00
c4a2e62a95
Merge pull request #1378 from justin808/justin808_cc
...
Lower Complexity of UsersController
2013-08-25 17:14:39 -07:00
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
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
3cffdb5a65
Merge pull request #1382 from novemberkilo/master
...
No more rails 4 deprecation warnings
2013-08-25 17:09:49 -07:00
32f717420d
add max_image_height site setting
2013-08-26 00:24:24 +02:00
d87389b38e
No more rails 4 deprecation warnings
2013-08-25 23:18:11 +02:00
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
fd7fd22932
FIX: changing another user's avatar changes yours
2013-08-25 17:33:43 +02:00
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
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
e1efde6707
Merge pull request #1376 from gcapizzi/lists_controller_refactoring
...
ListController refactoring
2013-08-25 07:29:35 -07:00
464595df5c
Lower Complexity of UsersController
...
https://codeclimate.com/github/discourse/discourse/UsersController#method-complexity
2013-08-24 22:57:12 -10:00
4c788e75f0
add a warning whenever the uploaded image is not a square
2013-08-25 00:25:47 +02:00
c0b051c9f6
Show Private Messages pill as a topic list rather than individual messages.
2013-08-24 16:58:16 -04:00
3b9e62e6b9
improved specs for avatar
2013-08-24 22:45:05 +02:00
20e8a8a38a
FIX: Don't onebox @mentions
2013-08-24 15:01:00 -04:00
6f19cb7252
Extract ListController#list_target_user
2013-08-24 19:38:02 +02:00
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
093ead7855
Support for ***bold and italics***
2013-08-24 13:06:07 -04:00
e9663e5338
Merge pull request #1332 from locks/user_email_observer
...
User email observer (Code Climate improvements)
2013-08-24 08:34:11 -07:00
08762f5666
Merge pull request #1369 from voisintotoro/voisintotoro-branch
...
PNG Files optimization
2013-08-24 08:32:15 -07:00
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
edbaafdd7b
default relative dates to 30 days vs 14
2013-08-23 23:28:51 -07:00
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
43a8bff652
add a site setting for allowing animated avatars
2013-08-23 18:55:02 +02:00
6a3c849067
Fix [object Object] in staff logs details modal
2013-08-23 10:08:35 -04:00
f36fc8c41f
remove unnecessary onebox body padding
2013-08-23 02:53:14 -07:00
5cf0c59628
remove onebox info left padding
2013-08-23 02:48:55 -07:00
84987cd835
Extracted nickname registration into a private controller method
2013-08-23 09:46:33 +00:00
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
3b15e2e58e
Banned users are not returned as pending review users
2013-08-22 19:23:49 -04:00
25e0c3eac1
Log IP addresses with screened emails and urls
2013-08-22 19:04:35 -04:00
612c0ccccb
FIX: Autolinking within a list
2013-08-22 18:03:01 -04:00
513f941f50
Fixes @mentions inside of lists
2013-08-22 17:50:36 -04:00
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
f2c4b3e37f
FIX: Following a mention with a coded mention.
2013-08-22 16:13:02 -04:00
6fe0d29a01
FIX: @mentions within backticks followed by proper @mentions.
2013-08-22 15:55:29 -04:00
5e50c4624f
FIX: New lines in code blocks were somewhat unpredictable
2013-08-22 13:46:51 -04:00
1dbe1fb1bc
Refactor User.find_by_username_or_email
...
* Improve test coverage
2013-08-22 09:40:07 -07:00
0f27232711
FIX: Support inline code blocks with @mentions in them.
2013-08-22 12:18:36 -04:00
24617dd776
Show empty categories with descriptions to everyone
2013-08-22 11:55:20 -04:00
1983da14c3
PNG Files optimization
2013-08-22 14:00:25 +02:00
ae93fcebde
FIX: Autolines were duplicating some text
2013-08-21 22:49:55 -04:00
a3757016d9
FIX: Quotes with new lines were broken
2013-08-21 22:36:02 -04:00
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
adbb6a19bb
Fix 'You must choose a category' when a category is already chosen
2013-08-21 16:14:22 -04:00
30cfa33629
FIX: @mentions within simple quotes
2013-08-21 16:10:16 -04:00
e5464a4bed
Show staff action log details in a modal
2013-08-21 12:33:24 -04:00
47add6da70
Log when a site customization is deleted
2013-08-21 12:33:24 -04:00
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
7f69a58439
Replace Markdown parser.
2013-08-21 10:10:57 -04:00
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
916a3f33f2
Refactored user activation business logic out of UsersController and
...
into a UserActivator class.
2013-08-21 09:22:34 +00:00
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
487788b65b
correct missing progress bar on navigation to new topic.
2013-08-21 08:37:30 +10:00
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
9204e0f420
do not disable the radio button in the avatar selection modal
2013-08-20 22:54:01 +02:00
dcfe4f2061
remove useless text beneath avatar
2013-08-20 21:53:17 +02:00
3abeb5f793
Staff action logs can be filtered to changes of one site setting
2013-08-20 13:50:51 -04:00
c0c929be5a
optimise query that runs every 10 minutes and takes out the user table
2013-08-20 17:40:22 +10:00
f4d833da27
fix onebox exception, if oneboxes fail on save we log a warning to the log
2013-08-20 11:38:10 +10:00
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
341a28402d
speed up scrolling on android
2013-08-20 11:25:15 +10:00
58b7df5480
change edit to std pencil glyph on avatars
2013-08-19 15:07:48 -07:00
dca0b6b9b8
Merge pull request #1358 from chrishunt/bump-favcount
...
Improve readability of count for complex favicons
2013-08-19 14:58:57 -07:00
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
df2b0b47bd
Merge pull request #1360 from michaelkirk/feature/oauth2
...
not recording Oauth2 user email
2013-08-19 14:57:05 -07:00
8107170f08
FIX: images in the preview have rounded corners
2013-08-19 23:45:55 +02:00
1d030666d8
Log site setting changes and show in admin
2013-08-19 16:58:38 -04:00
9e8d8870f5
fixed: record Oauth2 user email
2013-08-19 11:21:27 -07:00
3cc8354fe2
Don't trust topic title in template until it has been sanitized by the server
2013-08-19 14:19:59 -04:00
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
53f011e89e
Bump to favcount v1.1.0
2013-08-19 08:55:38 -07:00
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
f8129c4e43
Make the composer and TopicCreator use category id instead of category name
...
Also fixes #1171
2013-08-19 11:57:35 +02:00
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
4b0a1179e9
link to first unread as opposed to last read in topic lists
2013-08-19 11:34:08 +10:00
b69d089d06
we need to decalre favcount to keep tests happy
2013-08-18 21:52:13 +10:00
3b34ab8cab
Merge branch 'master' of github.com:discourse/discourse
2013-08-18 21:35:29 +10:00
82ca61f150
Merge pull request #1350 from michaelkirk/feature/oauth2
...
Feature/oauth2
2013-08-18 17:01:01 -07:00
1cab98bf78
Merge pull request #1336 from novemberkilo/master
...
First pass at fixing rails4 deprecation warnings
2013-08-18 16:59:07 -07:00
4372fc2f2e
Switch out faviconNotify for favcount.js
2013-08-18 11:26:03 -07:00
3f5b5f1581
Merge branch 'master' of github.com:discourse/discourse
2013-08-18 21:30:14 +10:00
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
3735cfdadb
Merge pull request #1348 from chrishunt/dynamically-png-me
...
Re-write dynamic favicon javascript
2013-08-17 03:26:14 -07:00
ef7231a66f
Add 32px image to default favicons (for retina)
2013-08-16 18:37:33 -07:00
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
ea6e73076b
change your avatar in a modal
2013-08-17 00:35:29 +02:00
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
7dd470ccc0
Oops, make highlight in topic list style-able too
2013-08-16 14:24:51 -04:00
40599d20e8
FIX: Footer formatting in digest emails
2013-08-16 12:19:26 -04:00
b6285b85d2
Add reject option to pending users page
2013-08-16 11:42:43 -04:00
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
865c882a61
larger avatars in embedded posts
2013-08-16 10:14:05 +02:00
2119774fb6
FIX: custom avatars in email
2013-08-16 09:58:20 +02:00
c314a1862f
add todo
2013-08-16 17:04:30 +10:00
946b02533b
better copy for password change button
2013-08-15 22:25:26 -07:00
b60c8080e5
Merge pull request #1337 from ZogStriP/avatar-work
...
Avatar work
2013-08-15 21:50:37 -07:00
4718929d52
"change" to edit pencil glyph on user pref buttons
2013-08-15 16:11:24 -07:00
c9969738bf
FIX: N+1 query for avatars when searching for users
2013-08-16 00:26:49 +02:00
8303f48004
add dimmed color to digest footer
2013-08-15 15:18:11 -07:00
2e640baffd
Fix a broken avatar when showing who deleted a post
2013-08-15 16:31:13 -04:00
73e4d866d2
Make it possible to customize post highlight colour with css
2013-08-15 16:17:37 -04:00
8a96c4c0f6
Fix uncategorized topics not being shown on categories page
2013-08-15 15:18:04 -04:00
5a4b939cf7
Fix edit category modal for uncategorized when showing it the second time
2013-08-15 15:18:04 -04:00
9ab2471a92
Fix rails4 deprecation warnings
...
That appear when running topic_spec.rb
2013-08-15 17:52:18 +02:00
293361dcd3
Screened URLs list in admin
2013-08-15 10:52:26 -04:00
ee95d7df9c
trigger observers, wow this is all very complicated and full of duct tape
2013-08-15 13:54:48 +10:00
fda6cce0de
minor refactor
2013-08-15 13:44:30 +10:00
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
b55c9e391d
Merge pull request #1333 from fabianoleittes/fix_type_url
...
Fix url not to be nil
2013-08-14 20:04:00 -07:00
b13796c35e
Refactoring the feature_topic_users method to improve
...
the code climate score.
2013-08-14 20:42:16 -05:00
4df8babb9a
Fix url not to be nil
2013-08-14 21:55:25 -03:00
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
c2653b2915
Merge pull request #1309 from stephankaag/sidetiq
...
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
8af51883bf
FIX: performance regression on activity streams
2013-08-15 01:32:27 +02:00
9170166e93
Finish renaming blocked emails to screen emails
2013-08-14 16:45:30 -04:00
3e7441177a
Merge pull request #1330 from ZogStriP/emails-can-be-mixed-case
...
only the host part of an email address is case insensitive
2013-08-14 13:26:49 -07:00
86647f0a54
Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail.
2013-08-14 16:08:23 -04:00
a6b4b5dbf2
Replace Clockwork with Sidetiq
2013-08-14 21:39:40 +02:00
5ca187ba57
only the host part of an email address is case insensitive
2013-08-14 19:31:35 +02:00
8fa9c51bf4
FIX: New avatar regression with mixed case email addresses.
2013-08-14 13:05:57 -04:00
aec929b184
Screw it, don't choose columns.
2013-08-14 12:26:31 -04:00
a05ffafd4c
FIX: Direct link to Avatar
2013-08-14 12:22:44 -04:00
479ca86713
FIX: Don't select columns if we don't have to.
2013-08-14 12:18:54 -04:00
803f5d85ee
Merge branch 'master' of github.com:discourse/discourse
2013-08-14 12:04:51 -04:00
6793cba4ae
FIX: Displaying actions
2013-08-14 12:04:35 -04:00
bc0d4f1bfc
Add a confirm modal to Delete All Posts button
2013-08-14 11:48:18 -04:00
506dd748da
Add warning sign icons to all the delete user buttons
2013-08-14 11:20:00 -04:00
4866f4d8f5
FIX: N+1 query for avatars
2013-08-14 15:25:05 +02:00
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
11dca1fd92
make code climate a bit happier
2013-08-06 06:25:44 +10:00
6e97ddc8ef
allow uploaded avatars by default
2013-08-05 14:08:08 +10:00
5f46dfedf1
Merge pull request #1320 from ZogStriP/local-avatars
...
Local avatars
2013-08-14 00:36:42 -07:00
9a7df140b7
updated model annotations
2013-08-13 22:09:27 +02:00
92b0cfe3d3
cleaned up non-used code
2013-08-13 22:09:10 +02:00
c867b67a0b
custom avatar support
2013-08-13 22:08:29 +02:00
e5e3164ea1
added the "allow uploaded avatars" site setting
2013-08-13 22:06:22 +02:00
95a2405c9e
larger avatar in the "in reply to" box
...
This one is for @BrentleyJones (cf.
http://meta.discourse.org/t/small-avatar-in-in-reply-to-box/8761 )
2013-08-13 22:04:38 +02:00
ed060ed5f1
Change trust level logs the previous trust level
2013-08-13 12:04:28 -04:00
6722a1fe22
some minor user deletion tweaks
2013-08-13 00:41:23 -07:00
b36c6d7b78
Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days.
2013-08-12 14:55:09 -04:00
879652f055
Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits.
2013-08-12 11:12:20 -04:00
556cb792e9
change topic share button to match link button
2013-08-10 21:07:42 -07:00
bb492eb8bf
Add filtering to staff logs page
2013-08-09 16:59:05 -04:00
652169daf6
Include a list of more new topics in the digest emails at the bottom
2013-08-09 14:43:02 -04:00
730f57a751
Tiny CSS change: add background to inline code values.
2013-08-09 12:54:46 -04:00
6452962f36
FIX: Notification counters were being updated incorrectly.
2013-08-09 12:12:56 -04:00
4d8585ac10
Put staff user in the first column
2013-08-09 11:24:50 -04:00
90a3bcf6ff
Add filter by action to staff logs page
2013-08-09 10:06:59 -04:00
33bddbff85
Use Ember.ListView for staff action logs page
2013-08-09 10:06:58 -04:00
0d44313a4b
Use Ember.ListView for blocked emails list
2013-08-09 10:06:58 -04:00
7fdaefcd86
FIX: Should allow support for ember list view
2013-08-08 23:13:26 -04:00
477eb81bc9
Updated docs for `Discourse.Singleton`
2013-08-08 13:00:48 -04:00
ce05b43c1d
Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful
2013-08-08 12:54:38 -04:00
86246a64eb
Convert `Discourse.Site` and `Discourse.ScreenTrack` to use `Discourse.Singleton`
2013-08-08 12:49:58 -04:00
51f5cf77fb
Convert `Discourse.User` to use `Discourse.Singleton`
2013-08-08 12:42:08 -04:00
8e1fae0459
Add `Discourse.Singleton` class mixin for creating singletons.
2013-08-08 12:00:58 -04:00
9564a6ce09
Don't include `user_deleted` posts in emails.
2013-08-08 10:32:51 -04:00
7343874360
oops, meant both
2013-08-07 16:42:26 -07:00
0ab5388839
hook nth-of-type to reply, not "row"
2013-08-07 16:38:54 -07:00
6656410c58
reduce padding between repeat embedded posts
2013-08-07 16:31:07 -07:00
6caf55994b
tighten up user page spacing a tiny bit
2013-08-07 16:11:16 -07:00
b097d780d0
Tweaks to staff action logs page
2013-08-07 18:29:13 -04:00
b6b30dabd4
Send context of where a user was deleted as a spammer so it can be logged
2013-08-07 18:18:18 -04:00
949b2068a5
Trust level change logs the target_user_id
2013-08-07 17:01:59 -04:00
b0848db6de
Oops, forgot to use i18n in some places
2013-08-07 16:46:23 -04:00
5c8c52482a
Add a way to view staff action logs in admin
2013-08-07 16:27:34 -04:00
d2fb6ec53f
Blocked Emails list in admin
2013-08-07 16:27:34 -04:00
c091b44028
Merge pull request #1310 from ZogStriP/patch-1
...
create thumbnails by defaults
2013-08-07 13:24:30 -07:00
66f9506481
FIX: IE9 regression
2013-08-07 16:20:22 -04:00
bbd05f37d2
create thumbnails by defaults
...
changed "create_thumbnails" default value to `true`
2013-08-07 22:18:50 +02:00
fe3a69c271
Private message emails now include the history
2013-08-07 13:03:45 -04:00
a53a6667aa
Added a missing "#" to href for TOS.
2013-08-07 00:45:55 -04:00
1c3804934e
Show the entire history of replies above a post when you expend "in reply to"
2013-08-06 17:43:10 -04:00
c74da0d262
Admins who haven't been approved can log in when must_approve_users is enabled
2013-08-06 16:51:29 -04:00
57baf1f112
Logout takes you to the front page instead of leaving you on your user activity page
2013-08-06 16:04:02 -04:00
879aa06601
Change tiny date formatting for dates in past years. Example: 10 Dec '12
2013-08-06 13:47:24 -04:00
890ded7b1b
make topic progress more visible
2013-08-05 15:10:53 -07:00
27f44e7e7e
increase modal max-width so errors fit better
2013-08-05 14:57:56 -07:00
c714b98595
Update ember-renderspeed slightly.
2013-08-05 16:20:36 -04:00
de3c657ea3
FIX: Oneboxes with incorrect URL
2013-08-05 16:15:16 -04:00
dbbc5248aa
Update ember-renderspeed. Much less overhead.
2013-08-05 15:00:35 -04:00
e90bbc6a6c
don't display debug information when running tests
2013-08-14 00:12:25 +02:00
ab2b7fc882
get rid of text-shadow in gutter
...
I blame iOS for this shit
2013-08-04 01:26:41 -07:00
8d08391ff5
FIX: Allow `Discourse.Session.current()` API to update to 0
2013-08-02 18:48:02 -04:00
91efbc1830
FIX: If an error occurs loading posts, revert state correctly
2013-08-02 18:42:46 -04:00
98b58150bb
Dashboard calculations are done with an async job now
2013-08-02 18:32:33 -04:00
1552c4b69e
Remove users column from Top Traffic Sources table on dashboard. It's not useful and very expensive to calculate.
2013-08-02 18:32:33 -04:00
f337aea982
FIX: Can edit 1st posts that have no categories
2013-08-02 17:41:01 -04:00
f996a8757a
add "post last edited at" to edit tooltip
2013-08-02 13:15:50 -07:00
94c969b7d8
set min-width on post unread counts
2013-08-02 12:41:40 -07:00
701843552a
Fixes to {{#groupedEach}}
2013-08-02 15:14:24 -04:00
9db0ac16a9
Add site setting delete_removed_posts_after to configure after how many hour posts that were deleted by their authors will be deleted
2013-08-02 13:35:52 -04:00
ef82b66e95
Easier to group bindings. Perf improvements.
2013-08-02 13:18:09 -04:00
8cc49d9797
Don't send more pm's after a user has been blocked from making posts. This can happen if a staff member flags posts that are already hidden.
2013-08-02 10:55:19 -04:00
d8c2856a4c
flatten the new / unread post badges
2013-08-02 03:47:06 -07:00
c4af6297b4
read restricted categories should have a glyph
2013-08-02 15:33:16 +10:00
af685e83ea
oh my this convenience method sure is not convenient
2013-08-02 15:11:09 +10:00
803d023e23
Fixed GitHub auth, GitHub can provide us with a valid email - so automatically log in for those cases
2013-08-02 12:16:44 +10:00
cf333268d5
Fix: flag modal sometimes doesn't have nuke user button when it should
2013-08-01 22:00:00 -04:00
76678f0024
broken hinting fixed
2013-08-02 11:09:54 +10:00
d343d512b9
favorite user action consistency
2013-08-02 11:07:18 +10:00
5e23a0681d
work in progress, will finalize soon
2013-08-02 09:59:25 +10:00
faeb4a9ebd
enhance upload selector
...
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
2013-08-02 01:30:18 +02:00
0f067a2ad3
we need that <hr> in notification emails, I think
2013-08-01 15:15:32 -07:00
952b1f6d71
Performance: Improve Ember.Object.create speed
2013-08-01 17:16:55 -04:00
b194bafcc8
Fix rendering of email logs rows. Needed thead around the first row.
2013-08-01 17:15:28 -04:00
236356bfe2
add foreground color to @mentions
2013-08-01 11:43:46 -07:00
be3c0f2bb4
FIX: Post Menu wasn't updating the bookmark icon properly.
2013-08-01 12:20:20 -04:00
4a0ea7f776
Upgrade jQuery to 2.0.3
2013-08-01 11:58:22 -04:00
361f158b27
Change category by editing first post updates topic title
2013-08-01 10:56:15 -04:00
4f0713b9da
Merge pull request #1275 from ZogStriP/enable-thumbnailing-on-s3
...
Enable thumbnailing on s3
2013-08-01 07:35:35 -07:00
1132c10074
support server side js and arbitrary assets
...
proper chaining for emoji so other hooks can be called
2013-08-01 17:35:31 +10:00
160107a712
working plugin interface for custom openid auth, custom css and custom js
2013-08-01 16:02:43 +10:00
ed9417fa3b
enable thumbnailing on S3
...
- added url to optimized image model
- refactored s3_store & local_store
2013-07-31 23:26:34 +02:00
2af6cd616d
Use allow_uncategorized_topics site setting in categoryChoose
2013-07-31 16:48:23 -04:00
27498a912b
Add indexes to help IncomingLinksReport, but not much. Refactor to limit result set size, but it doesn't help perf much either. SELECT COUNT(DISTINCT ...) is still slow.
2013-07-31 15:17:53 -04:00
023c908d5a
FIX: Back button broke when clicking @mentions
2013-07-31 15:08:03 -04:00
51d86b7a91
Front-end Optimizations
2013-07-31 14:53:10 -04:00
5028fdbed6
oops background-color not color
2013-07-31 11:41:29 -07:00
3c03920d30
Merge pull request #1266 from bolandrm/fix_at_sign
...
fix mentions in code blocks
2013-07-31 07:22:18 -07:00
5ee1df6bca
Fix assets:precompile failure from missing @include
2013-07-30 21:02:11 -05:00
c5f03986c0
prettify staff bg slightly
2013-07-30 16:25:18 -07:00
90bcd73b31
make topic title icons properly sized
2013-07-30 16:18:29 -07:00
b6f17a6493
we don't need a whole extra group for 1 pref
2013-07-30 15:43:38 -07:00
81de7dc0af
simplify @mention CSS, add $quote-background color
2013-07-30 15:28:18 -07:00
553a671fdb
fix mentions in code blocks
2013-07-30 18:01:42 -04:00
a2844ea3c6
An attempt at some Perf improvements
2013-07-30 17:27:56 -04:00
882c1524f7
Strip trailing and leading spaces from category names
2013-07-30 16:48:45 -04:00
277e4db2cb
Use ellipsis in dashboard referred topics table. Add .overflow-ellipsis css helper.
2013-07-30 16:48:45 -04:00
16cd3e2a53
Fix to allow admins to change the case of a someone's username
2013-07-30 16:48:45 -04:00
06140740d0
Version checks: tolerate old version check data that can happen immediately after upgrading but forgetting to restart sidekiq/clockwork. Don't cache version check data along with other dashboard data.
2013-07-30 12:12:04 -04:00
fc25da09e3
Revert "Remove RawDivView and use regular handlebars"
...
This reverts commit e7f349ff0f
2013-07-30 11:20:11 -04:00
8ef771ad8d
Use warning-sign icon instead of trash for nuke user buttons
2013-07-29 18:31:47 -04:00
4fd5087f91
Add button to delete a spammer in the flag modal
...
Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI
Moderators can delete users too
2013-07-29 15:29:44 -04:00
e076158789
Add ip_address, email, and context to staff_action_logs table. Context should usually be the url from which the staff member performed the action, but could be any string that describes what the staff member was doing when the action was performed.
2013-07-29 15:29:43 -04:00
5f3e9131ed
Deleting a user from admin user page has the option to also block signups from the same email address
2013-07-29 15:29:43 -04:00
8cee3a9fcd
Add a way to add email to block list when nuking a user
2013-07-29 15:29:43 -04:00
5f8a130277
Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field.
2013-07-29 15:29:43 -04:00
e25638dab0
add a way to delete posts and topics when deleting a user with UserDestroyer
2013-07-29 15:29:43 -04:00
a8df9778b5
Rename AdminLog to StaffActionLog
2013-07-29 15:29:43 -04:00
cc4ae05be3
Left in an extra function.
2013-07-29 14:56:59 -04:00
1c17f409bd
Remove an `{{#if}}`
2013-07-29 14:50:19 -04:00
08ebaf926b
Move deleted at into actions history, where it should be.
2013-07-29 14:46:25 -04:00
323aea78e2
Remove unused PrependPostView
2013-07-29 14:19:35 -04:00
e7f349ff0f
Remove RawDivView and use regular handlebars
2013-07-29 14:17:03 -04:00
b11e1f8b40
Added ember-renderspeed library for profiling rendering. Removed old probes stuff that
...
that was just profiling the run loop.
2013-07-29 12:52:09 -04:00
22893e203a
Merge pull request #1260 from sir-pinecone/reactivate-admin-refresh-btn
...
Fix auto-group refresh response so that ajax callback runs
2013-07-28 22:22:55 -07:00
56f7c18b09
Merge pull request #1259 from sir-pinecone/hide-admin-group-link-from-staff
...
hide groups nav link from non-admins
2013-07-28 22:22:09 -07:00
aa6c92922d
SECURITY: correct our CSRF implementation to be much more aggressive
2013-07-29 15:13:13 +10:00
4a20d09523
distributed memoizer added to ensure absolute duplicate posts don't get through
...
in case of an absolute dupe just return the memoized post
This works around issues with wordpress being crazy
2013-07-29 12:25:19 +10:00
a0cbbab37a
FIX: Loading was broken on activity streams
2013-07-27 13:55:34 -04:00
3a861c0823
FIX: Allow clicks on @names
2013-07-27 13:18:37 -04:00
aa7e96c0fa
Fix auto-group refresh response so that ajax callback runs
2013-07-26 19:47:32 -04:00
16d5032143
hide groups nav link from non-admins
2013-07-26 18:58:50 -04:00
01a6b45231
FIX: Can click on your own links again
2013-07-26 17:29:43 -04:00
385b2fbde2
Some tests for the user stream
2013-07-26 17:09:54 -04:00
5d66f6ed8e
Minor fixes. Link directoy to user activity to avoid a redirect.
2013-07-26 15:56:29 -04:00
e77ee1eaa8
Moved highestSeenByTopic to the Discourse.Session
2013-07-26 15:18:46 -04:00
894dc2c6fd
Moved Discourse.ajax into a mixin.
2013-07-26 15:12:40 -04:00
20f3707fbe
Moved Resolver to new File
2013-07-26 15:04:29 -04:00
773823c41f
Remove Discourse.transient. Use a singleton for session data, it's a lot cleaner.
2013-07-26 14:59:28 -04:00
fca83cb185
Upgrade Ember to Fix CVE-2013-4170
2013-07-26 13:10:52 -04:00
c28b377494
Don't redirect to arbitrary URLs via link tracker
2013-07-26 12:14:11 -04:00
29519ece23
Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox
...
Conflicts:
app/assets/stylesheets/application/compose.css.scss
app/assets/stylesheets/application/topic-post.css.scss
2013-07-26 11:30:40 -04:00
d71e7cdfde
Merge pull request #1254 from crob611/master
...
Prevent 'Quote reply' from appearing when using find in Chrome
2013-07-26 08:09:08 -07:00
c9c68c2cb2
Show Edit buttons to staff on categories page again
2013-07-26 10:39:26 -04:00
234474af1b
Fix 'undefined' in Create Category modal title
2013-07-26 10:31:56 -04:00
d579e4c5d5
Prevent category badges from wrapping on white space
2013-07-26 10:11:00 -04:00
d51dcd1705
improve email styling, include extra respond link
2013-07-26 17:27:46 +10:00
809594c00a
correct ScreenTrack so it properly flushes everything that happened on stop and resets on start
2013-07-26 14:41:46 +10:00
d25d1f777c
Prevent 'Quote reply' from appearing when using find in Chrome
2013-07-25 22:57:03 -05:00
d7d3be1130
Add audio onebox
...
http://meta.discourse.org/t/audio-html5-tag/8168
2013-07-25 19:03:23 -07:00
9edd163228
Oops, left in another console.log :)
2013-07-25 16:06:58 -04:00
0317cf9608
Show topics as a list of topics on the User Stream.
2013-07-25 15:56:20 -04:00
589e9916f2
fix so some half working locales boot
2013-07-25 11:25:30 +10:00
d0f50cb266
fixing up moment locales, they were not set up properly
2013-07-25 11:09:29 +10:00
1b02a7c580
missing semi colon
2013-07-24 17:32:07 -04:00
8408795093
Support for default User Index
2013-07-24 17:18:10 -04:00
9351a7bcb1
Merge pull request #1244 from stephankaag/rails4updates
...
Rails 4 updates
2013-07-24 14:16:32 -07:00
9132931aa9
Use {{outlets}} for user activity views so we can swap some out.
2013-07-24 15:54:02 -04:00
f99acebdaa
Rails 4 updates
2013-07-24 21:09:18 +02:00
366cb13140
restyle all user notification emails to use a custom html template
2013-07-24 17:24:55 +10:00
cb5ce3aab9
Merge pull request #1247 from sir-pinecone/strip-spaces-from-login
...
Strip leading/trailing spaces from login
2013-07-24 00:16:55 -07:00
880dd53f48
Merge pull request #1249 from sir-pinecone/strip-spaces-from-group
...
Strip spaces from group names upon creation
2013-07-24 00:15:53 -07:00
867ce0310c
display group validation errors in alert modal
2013-07-24 00:42:44 -04:00
b223cdb493
Strip spaces from group names upon creation
2013-07-24 00:00:17 -04:00
25f8692a79
Strip leading/trailing spaces from login
2013-07-23 23:03:38 -04:00
be9217d4c8
add server-side filesize check on uploads
2013-07-24 00:54:41 +02:00
75491d2cf6
remove console.log
2013-07-23 18:03:35 -04:00
82465caf97
Clean up user activity code in preparation for topic rendering
2013-07-23 17:01:43 -04:00
c9c6a8fd9d
User stream now uses eyeline for loading more content.
2013-07-23 16:06:26 -04:00
44bebf255d
Fix layout of category badges on categories page and in combobox
2013-07-23 15:05:37 -04:00
96af490d7c
FIX: Deleting posts in bulk was broken.
2013-07-23 14:59:05 -04:00
6237a155e7
FIX: Linking to users on admin dashboard was broken
2013-07-23 13:35:32 -04:00
d8978cb4a0
FIX: Redirect on some URLs to wrong path
2013-07-23 12:15:44 -04:00
adf7c9ad06
Merge pull request #1237 from stephankaag/improve_post_analyzing
...
Improve post analyzing
2013-07-23 07:07:49 -07:00
3ee6e42016
FIX: Server side errors with Topic.similar_to
2013-07-23 10:02:58 -04:00
7c5e15966f
Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments
...
uploads selector texts is now different when attachments are enabled
2013-07-23 00:44:17 -07:00
9ac6c6e2e9
Merge pull request #1233 from sir-pinecone/improve-group-deletion
...
Add confirmation modal to admin group deletion
2013-07-23 00:43:06 -07:00
7e92109ac8
Merge pull request #1240 from abbat/master
...
Fix locale dependend stemmer for FTS
2013-07-23 00:40:54 -07:00
73e0418b41
deleted class only for real deleted posts
2013-07-23 15:42:44 +10:00
3ad7d74c52
correct no highlighting categories when clicked
2013-07-23 13:24:39 +10:00
060c79ecc0
remove dupes before correcting topic_ids in user action consistency check job
2013-07-23 12:44:20 +10:00
9c5734b773
tone down badges for the love of all that is good
2013-07-23 12:44:20 +10:00
35a2bb7919
Parameterize the PBKDF2 algorithm in application config
...
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
2013-07-22 21:36:01 -04:00
4b269de724
correct: http://meta.discourse.org/t/cant-save-adding-a-group-permission-to-a-category/8537
...
can not save category after adding a new custom group
2013-07-23 10:10:36 +10:00
0acc96c94e
work around for http://meta.discourse.org/t/activerecord-statementinvalid-exception-raised-in-models-user-action-rb/7275/4
2013-07-23 09:48:18 +10:00
aa7d1c2fbe
Fix locale dependend stemmer for FTS
...
Fix locale dependend stemmer for FTS to improve search relevance on non English languages.
2013-07-23 03:07:59 +04:00
ea7684fb32
Merge pull request #1226 from stephankaag/rails4_updates
...
Some Rails4 updates
2013-07-22 15:03:37 -07:00
6474e7df97
uploads selector texts is now different when attachments are enabled
2013-07-22 23:15:23 +02:00
6221fe2d60
JSHint fix
2013-07-22 16:56:09 -04:00
43ceacabab
Link to edit "About Me" links directly to the field.
2013-07-22 16:53:21 -04:00
b58da2fcf9
Add some TODO's
2013-07-22 22:39:20 +02:00
ebd5fa76c5
Reuse post-analyzer and cooked-document when requesting multiple post stats
2013-07-22 22:24:47 +02:00
a0465485b4
use group.get as per PR comment
2013-07-22 16:19:08 -04:00
ad2b667504
Remove dead code
2013-07-22 22:16:46 +02:00
fd1d376975
Merge pull request #1235 from stephankaag/remove_all
...
Remove some calls to `all`
2013-07-22 12:26:00 -07:00
0ad93e436c
Merge pull request #1232 from sir-pinecone/fix-group-member-removal
...
Fix for autocomplete delete action removing only the last item
2013-07-22 12:22:14 -07:00
4aa8f718d0
Merge pull request #1236 from jbruni/pt_BR
...
Brazilian Portuguese translation of "static" files (FAQ, TOS and Privacy)
2013-07-22 12:18:34 -07:00
3e7b418ea8
First Try: Include Post History (context) in Notification Emails
2013-07-22 15:06:37 -04:00
e257cfc56c
Merge branch 'master' into pt_BR
2013-07-22 16:00:09 -03:00
1c78b485d3
Brazilian Portuguese translation (FAQ) - improvements and corrections
2013-07-22 15:46:26 -03:00
701eac17c7
Brazilian Portuguese translation (Terms of Service)
2013-07-22 15:45:40 -03:00
0e3b8fbb24
Remove some calls to `all`. They are not required, and Rails4 raises warnings about them.
2013-07-22 20:44:11 +02:00
b19f631b3a
Some Rails4 updates
2013-07-22 19:01:22 +02:00
112b9f9c2a
FIX: The previous flag reason was selected when opening the modal.
2013-07-22 12:05:13 -04:00
e73c809836
FIX: Reply as new Topic wasn't clearing drafts
2013-07-22 11:42:22 -04:00
52acbec647
Load pagedown_custom.js a bit later so it can use translations
2013-07-22 11:01:15 -04:00
0c4e3d5233
Merge pull request #1221 from jbruni/patch-1
...
Update faq.en.html.erb (only fixed a comma position)
2013-07-22 07:35:00 -07:00
a71e4d5216
Merge pull request #1219 from bolandrm/fix_graphical_error_admin_dash
...
Fix Graphical Error on Admin Dashboard
2013-07-22 07:33:08 -07:00
ed745c3fdd
Merge pull request #1222 from ZogStriP/fix-s3-related-issues
...
Fix s3 related issues
2013-07-22 07:30:41 -07:00
0f1533f41d
Merge pull request #1229 from ZogStriP/close-lightbox-when-using-back-button
...
FIX: lightbox is not closed when using the back button
2013-07-22 07:29:53 -07:00
80a0943f54
Merge pull request #1228 from ZogStriP/fix-thumbnailing-with-cdn-enabled
...
FIX: thumbnailing isn't working with CDN enabled
2013-07-22 07:22:59 -07:00
8b181e0803
Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting
...
add newuser-max-attachments setting
2013-07-22 07:22:23 -07:00
ceb36a62c8
Merge pull request #1231 from jbruni/patch-2
...
Update tos.en.html.erb
2013-07-22 07:21:41 -07:00
1f3c5cb656
allow end user to recover a post they delete
...
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
d68f30c09d
flatten and simplify default category badge styles
2013-07-22 00:11:34 -07:00
5bb2090b81
fix way too tall line-height for user titles
2013-07-21 23:54:10 -07:00
9616767bff
Add confirmation modal to admin group deletion
2013-07-22 02:48:23 -04:00
58e7c3e1f3
push some work out of AR callbacks into PostCreator, add a couple of helpers for post and topic creation in test
...
fix it so the auto_track false marks topics as new
2013-07-22 15:07:20 +10:00
0ec1438b9a
correct auto track param parsing for WordPress
2013-07-22 15:07:20 +10:00
acba0ea41e
add auto track to permitted params
2013-07-22 15:07:20 +10:00
31bb08bcdd
added an option to bypass auto tracking of topics on post creation
2013-07-22 15:07:20 +10:00
9e4b0df7ff
69 specs fail in rails 4 now ...not too bad
2013-07-22 15:07:20 +10:00
e471ffd07b
Fix for autocomplete delete action removing only the last item
2013-07-21 22:37:01 -04:00
695d2abdbc
Update tos.en.html.erb
...
Substituted literal "Wordpress" (as seen at http://en.wordpress.com/tos/ ) by company domain tag
2013-07-21 23:20:39 -03:00
2986798ba7
add newuser-max-attachments setting
2013-07-22 02:39:17 +02:00
418d8c7377
FIX: lightbox is not closed when using the back button
2013-07-22 01:21:43 +02:00
649ab85740
FIX: thumbnailing wasn't working with CDN enabled
2013-07-22 00:37:23 +02:00
af8ea2d87d
Brazilian Portuguese translation (Privacy)
2013-07-20 18:57:07 -03:00
d38caed7fb
Brazilian Portuguese translation (FAQ)
2013-07-20 18:56:45 -03:00
33977252c9
rollback to previous s3 syntax (ie. subdomains)
2013-07-20 11:30:36 +02:00
d474944043
Update fq.en.html.erb (only fixed a comma position)
...
you love pull requests, and I care about details
2013-07-20 04:24:00 -03:00
cacbcaeb7e
blank responses led to an undefined on the user screen
2013-07-19 17:21:51 +10:00
f6963a05c4
fix graphical error
2013-07-18 23:26:04 -04:00
8406a4230c
FIX: click tracking on attachments wasn't working
2013-07-19 01:27:09 +02:00
7a6f1b5aff
Color moderator actions on user stream
2013-07-18 17:24:51 -04:00
257ddf5fc9
FIX: Private message link on messages view did not work. Removed a lot of duplication.
2013-07-18 17:07:05 -04:00
7d4b089cd1
FIX: Suggested Topics were sometimes disappearing
2013-07-18 16:09:03 -04:00
419cbc7701
FIX: Double load on back button
2013-07-18 15:40:06 -04:00
751b757c1d
FIX: Some failing specs
2013-07-18 12:26:38 -04:00
e3bbb2c8bb
Never render an avatar img if we know the username is invalid.
2013-07-18 12:03:09 -04:00
910c88c48e
FIX: Private Message button wasn't populating username
2013-07-18 10:43:38 -04:00
a97c093434
FIX: Don't transition to when viewing a user. Just render it.
2013-07-17 18:13:43 -04:00
3761ccb018
FIX: Sometimes the total post count could be incorrect
2013-07-17 16:50:20 -04:00
19f3a8d640
Each user activity filter has its own URL now.
2013-07-17 15:42:31 -04:00
3238e0caa4
JSHINT
2013-07-17 10:31:27 -04:00
86c884aa29
FIX: Only show undelete button when the topic is deleted
2013-07-17 10:21:47 -04:00
5a5e9d0fd1
Merge pull request #1206 from BrentleyJones/fixed_modals
...
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
2013-07-17 06:59:48 -07:00
e2ff064aa3
Merge pull request #1198 from prem-prakash/master
...
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
81616a46ba
db consistency check for mismatching topic_ids in user_actions
...
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
2013-07-17 16:40:56 +10:00
c2be81a76e
Merge pull request #1199 from ZogStriP/uploads
...
adds the `max_attachment_size_kb` setting
2013-07-16 23:03:42 -07:00
2573935155
improve security UI
2013-07-17 15:10:49 +10:00
625204c8bd
work in progress category UI
...
refactor hack from earlier
2013-07-17 14:54:21 +10:00
5a7e78f0fc
fix unit tests
2013-07-17 14:22:55 +10:00
63cbe8dd17
fix links to site contents, fix it so the site contents page is refreshable
2013-07-17 14:15:09 +10:00
d1dbcf52fc
see: https://github.com/emberjs/ember.js/pull/2148
2013-07-17 09:55:30 +10:00
5c27dd175a
make sure we handle both s3 url formats
2013-07-17 00:32:09 +02:00
7ae2fe304d
renamed s3 to s3_store
2013-07-17 00:27:52 +02:00
f26b479458
FIX: History modal having custom (old) setting of min height and width.
...
It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
2013-07-16 21:05:33 +00:00
a03e933eb6
Fix spacing
2013-07-16 19:16:22 +00:00
e060e952b5
Accidently removed some styles in the merge
2013-07-16 19:06:33 +00:00
5e08427dd3
Merge branch 'master' into fixed_modals
...
Conflicts:
app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
app/assets/stylesheets/application/modal.css.scss
2013-07-16 18:58:49 +00:00
cc28a4ddc3
FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way.
2013-07-16 18:32:35 +00:00
7c9bd8e8c9
Remove EvilTrout's stupid mistake.
2013-07-16 13:51:00 -04:00
2577d76e4f
Revert "Merge pull request #1201 from BrentleyJones/fixed_modals"
...
This reverts commit 7e889c4e24e9d37f395f
2013-07-16 13:38:01 -04:00
4bfb546942
Removed `modelReady` hack now that the async router exists
2013-07-16 13:24:59 -04:00
6929ee9f46
Changed HTML again on hamburger menu to make it easier to style
2013-07-16 12:24:18 -04:00
82c734ec84
FIX: FAQ wasn't loading sometimes
2013-07-16 12:11:30 -04:00
d466d11e71
Ember RC6 update
2013-07-16 10:35:18 -04:00
75282576b9
Merge pull request #1195 from initforthe/post-analyser-backtrace-fix
...
Post analyser backtrace fix
2013-07-16 07:34:54 -07:00
7e889c4e24
Merge pull request #1201 from BrentleyJones/fixed_modals
...
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 07:31:17 -07:00
e9d37f395f
hmm I totally missed that it was already there
2013-07-16 21:06:04 +10:00
06bd9e3234
allow login required screen to be customized
2013-07-16 20:49:04 +10:00
dc3079db37
fix mucked up styling, glyph should be inside the hyperlink so it gets color
2013-07-16 18:01:34 +10:00
ff7d9cac38
fix non localized said: in quotes
2013-07-16 17:22:54 +10:00
ef1c71ba98
missed a qunit test
2013-07-16 15:48:41 +10:00
352ac9e60c
Finalize read only and post only categories, finished off UI work
2013-07-16 15:46:11 +10:00
fce2d0e3b6
reply to first post === reply to topic
2013-07-16 15:46:11 +10:00
a3155858a0
Fix share URL for first post
2013-07-16 15:46:11 +10:00
ecf17cfebb
work in progress, add fidelity to category group permissions (full, create posts, readonly)
2013-07-16 15:46:11 +10:00
c7697bbae2
remove duplicate code
2013-07-16 15:44:38 +10:00
d1ab694920
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 03:40:15 +00:00
5ce05ff5cb
adds the `max_attachment_size_kb` setting
...
so that we can specify a different max upload size for attachments and images.
2013-07-16 02:01:36 +02:00
8c5e0e7550
Adding Portuguese-Brazil language
2013-07-15 14:45:16 -03:00
e8f3e7c2e8
Added classes for styling to hamburger menu
2013-07-15 13:31:52 -04:00
0e504aac9b
FIX: You can reset your password even if logins are required.
2013-07-15 12:12:54 -04:00
08723f00c6
FIX: Bugs on Admin User approval interface
2013-07-15 11:28:41 -04:00
ed60f24502
Merge pull request #1194 from ZogStriP/uploads
...
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
Neil Lalonde
Robin Ward
Sam
Kris Aubuchon
Einar Jonsson
Gosha Arinich
Régis Hanol
Eric Kelly
Emili Parreno
Navin Keswani
Justin Gordon
Giuseppe Capizzi
Ricardo Mendes
Jeff Atwood
Scott Albertson
voisintotoro
Michael Kirk
Chris Hunt
Viktor Palmkvist
Navin
Ben Hicks
Fabiano Leite
Stephan Kaag
Don Denton
Zachary Lewis
Ryan Boland
Michael Campagnaro
Corey Robertson
James Anderson
Doug Alcorn
Anton Batenev
J. Bruni
Michael Campagnaro
J Bruni
Brentley Jones
premprakash