codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-11 00:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5367 commits 7 branches 179 tags 87 MiB
Commit graph

883 commits

Author SHA1 Message Date
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
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
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
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
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
Scott Albertson
1dbe1fb1bc Refactor User.find_by_username_or_email 
* Improve test coverage
 2013-08-22 09:40:07 -07:00
Neil Lalonde
24617dd776 Show empty categories with descriptions to everyone 2013-08-22 11:55:20 -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
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
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
Neil Lalonde
1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -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
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
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
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
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
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
Régis Hanol
c9969738bf FIX: N+1 query for avatars when searching for users 2013-08-16 00:26:49 +02:00
Neil Lalonde
8a96c4c0f6 Fix uncategorized topics not being shown on categories page 2013-08-15 15:18:04 -04:00
Navin
9ab2471a92 Fix rails4 deprecation warnings 
That appear when running topic_spec.rb
 2013-08-15 17:52:18 +02:00
Sam
ee95d7df9c trigger observers, wow this is all very complicated and full of duct tape 2013-08-15 13:54:48 +10:00
Sam
fda6cce0de minor refactor 2013-08-15 13:44:30 +10:00
Sam
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
Sam
b55c9e391d Merge pull request #1333 from fabianoleittes/fix_type_url 
Fix url not to be nil
 2013-08-14 20:04:00 -07:00
Ben Hicks
b13796c35e Refactoring the feature_topic_users method to improve 
the code climate score.
 2013-08-14 20:42:16 -05:00
Fabiano Leite
4df8babb9a Fix url not to be nil 2013-08-14 21:55:25 -03:00
Sam
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
Sam
c2653b2915 Merge pull request #1309 from stephankaag/sidetiq 
Replace Clockwork with Sidetiq
 2013-08-14 16:51:04 -07:00
Régis Hanol
8af51883bf FIX: performance regression on activity streams 2013-08-15 01:32:27 +02:00
Robin Ward
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
Neil Lalonde
86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Stephan Kaag
a6b4b5dbf2 Replace Clockwork with Sidetiq 2013-08-14 21:39:40 +02:00
Régis Hanol
5ca187ba57 only the host part of an email address is case insensitive 2013-08-14 19:31:35 +02:00
Robin Ward
8fa9c51bf4 FIX: New avatar regression with mixed case email addresses. 2013-08-14 13:05:57 -04:00
Régis Hanol
4866f4d8f5 FIX: N+1 query for avatars 2013-08-14 15:25:05 +02:00
Sam
6e97ddc8ef allow uploaded avatars by default 2013-08-05 14:08:08 +10:00
Régis Hanol
9a7df140b7 updated model annotations 2013-08-13 22:09:27 +02:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Régis Hanol
e5e3164ea1 added the "allow uploaded avatars" site setting 2013-08-13 22:06:22 +02:00
Jeff Atwood
6722a1fe22 some minor user deletion tweaks 2013-08-13 00:41:23 -07:00
Neil Lalonde
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
Neil Lalonde
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
Neil Lalonde
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6 Include a list of more new topics in the digest emails at the bottom 2013-08-09 14:43:02 -04:00
Robin Ward
6452962f36 FIX: Notification counters were being updated incorrectly. 2013-08-09 12:12:56 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
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
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00
Régis Hanol
bbd05f37d2 create thumbnails by defaults 
changed "create_thumbnails" default value to `true`
 2013-08-07 22:18:50 +02:00
Robin Ward
fe3a69c271 Private message emails now include the history 2013-08-07 13:03:45 -04:00
Robin Ward
1c3804934e Show the entire history of replies above a post when you expend "in reply to" 2013-08-06 17:43:10 -04:00
Neil Lalonde
98b58150bb Dashboard calculations are done with an async job now 2013-08-02 18:32:33 -04:00
Neil Lalonde
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
Neil Lalonde
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
Sam
d343d512b9 favorite user action consistency 2013-08-02 11:07:18 +10:00
Sam
5e23a0681d work in progress, will finalize soon 2013-08-02 09:59:25 +10:00
Régis Hanol
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
Robin Ward
4f0713b9da Merge pull request #1275 from ZogStriP/enable-thumbnailing-on-s3 
Enable thumbnailing on s3
 2013-08-01 07:35:35 -07:00
Régis Hanol
ed9417fa3b enable thumbnailing on S3 
- added url to optimized image model
- refactored s3_store & local_store
 2013-07-31 23:26:34 +02:00
Neil Lalonde
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
Ryan Boland
553a671fdb fix mentions in code blocks 2013-07-30 18:01:42 -04:00
Neil Lalonde
882c1524f7 Strip trailing and leading spaces from category names 2013-07-30 16:48:45 -04:00
Neil Lalonde
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
Neil Lalonde
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
Neil Lalonde
8cee3a9fcd Add a way to add email to block list when nuking a user 2013-07-29 15:29:43 -04:00
Neil Lalonde
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
Neil Lalonde
a8df9778b5 Rename AdminLog to StaffActionLog 2013-07-29 15:29:43 -04:00
Robin Ward
3a861c0823 FIX: Allow clicks on @names 2013-07-27 13:18:37 -04:00
Robin Ward
01a6b45231 FIX: Can click on your own links again 2013-07-26 17:29:43 -04:00
Stephan Kaag
f99acebdaa Rails 4 updates 2013-07-24 21:09:18 +02:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Robin Ward
adf7c9ad06 Merge pull request #1237 from stephankaag/improve_post_analyzing 
Improve post analyzing
 2013-07-23 07:07:49 -07:00
Sam
7e92109ac8 Merge pull request #1240 from abbat/master 
Fix locale dependend stemmer for FTS
 2013-07-23 00:40:54 -07:00
Sam
060c79ecc0 remove dupes before correcting topic_ids in user action consistency check job 2013-07-23 12:44:20 +10:00
Doug Alcorn
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
Sam
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
Sam
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
Anton Batenev
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
Sam
ea7684fb32 Merge pull request #1226 from stephankaag/rails4_updates 
Some Rails4 updates
 2013-07-22 15:03:37 -07:00
Stephan Kaag
b58da2fcf9 Add some TODO's 2013-07-22 22:39:20 +02:00
Stephan Kaag
ebd5fa76c5 Reuse post-analyzer and cooked-document when requesting multiple post stats 2013-07-22 22:24:47 +02:00
Stephan Kaag
ad2b667504 Remove dead code 2013-07-22 22:16:46 +02:00
Robin Ward
fd1d376975 Merge pull request #1235 from stephankaag/remove_all 
Remove some calls to `all`
 2013-07-22 12:26:00 -07:00
Robin Ward
3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
Stephan Kaag
0e3b8fbb24 Remove some calls to all. They are not required, and Rails4 raises warnings about them. 2013-07-22 20:44:11 +02:00
Stephan Kaag
b19f631b3a Some Rails4 updates 2013-07-22 19:01:22 +02:00
Robin Ward
ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues 
Fix s3 related issues
 2013-07-22 07:30:41 -07:00
Robin Ward
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
Robin Ward
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
Sam
1f3c5cb656 allow end user to recover a post they delete 
automatically delete stubs after 1 day
 2013-07-22 17:48:47 +10:00
Sam
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
Sam
31bb08bcdd added an option to bypass auto tracking of topics on post creation 2013-07-22 15:07:20 +10:00
Sam
9e4b0df7ff 69 specs fail in rails 4 now ...not too bad 2013-07-22 15:07:20 +10:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol
649ab85740 FIX: thumbnailing wasn't working with CDN enabled 2013-07-22 00:37:23 +02:00
Régis Hanol
33977252c9 rollback to previous s3 syntax (ie. subdomains) 2013-07-20 11:30:36 +02:00
Régis Hanol
8406a4230c FIX: click tracking on attachments wasn't working 2013-07-19 01:27:09 +02:00
Robin Ward
7a6f1b5aff Color moderator actions on user stream 2013-07-18 17:24:51 -04:00
Sam
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
Sam
c2be81a76e Merge pull request #1199 from ZogStriP/uploads 
adds the `max_attachment_size_kb` setting
 2013-07-16 23:03:42 -07:00
Régis Hanol
5c27dd175a make sure we handle both s3 url formats 2013-07-17 00:32:09 +02:00
Régis Hanol
7ae2fe304d renamed s3 to s3_store 2013-07-17 00:27:52 +02:00
Robin Ward
75282576b9 Merge pull request #1195 from initforthe/post-analyser-backtrace-fix 
Post analyser backtrace fix
 2013-07-16 07:34:54 -07:00
Sam
e9d37f395f hmm I totally missed that it was already there 2013-07-16 21:06:04 +10:00
Sam
06bd9e3234 allow login required screen to be customized 2013-07-16 20:49:04 +10:00
Sam
352ac9e60c Finalize read only and post only categories, finished off UI work 2013-07-16 15:46:11 +10:00
Sam
ecf17cfebb work in progress, add fidelity to category group permissions (full, create posts, readonly) 2013-07-16 15:46:11 +10:00
Régis Hanol
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
Tom Russell
96065a1499 Prevent backtrace in PostAnalyser 2013-07-15 11:15:04 +01:00
Régis Hanol
6f2ce93ab2 FIX: create an upload when FastImage throws an exception 
FastImage might throw an exception when it isn't able to recognize a
file as being an image (ie. happens when users changes the extension
manually)

Also improved upload specs a lot
 2013-07-13 23:42:19 +02:00
Robin Ward
7fd8bb75d9 Merge pull request #1177 from ZogStriP/attachments 
Attachments
 2013-07-11 06:49:20 -07:00
Sam
1aef6de4b0 automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite) 
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
 2013-07-11 11:22:00 +10:00
Régis Hanol
ac41e94619 refactor optimized_image a bit 2013-07-10 22:59:54 +02:00
Régis Hanol
27ab5f471c support arbitrary attachments 2013-07-10 22:59:53 +02:00
Neil Lalonde
8814f9ed05 Fix a case when a staff user views a topic with a deleted post by a nuked user; might be a temporary solution until we decide what to do with nuked records 2013-07-10 16:52:47 -04:00
Neil Lalonde
0e3e5bf533 Add relative_date_duration site setting 2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb Merge pull request #1157 from abbat/email-custom-headers 
Add custom headers for email messages
 2013-07-10 07:12:51 -07:00
Robin Ward
b7327942af Add deleted_by to Trashable tables 2013-07-09 15:46:36 -04:00
Neil Lalonde
ba7a4e9845 Merge pull request #1165 from novemberkilo/feature/log-trust-level-boosts 
Log all changes of user trust level by an admin
 2013-07-09 12:16:08 -07:00
Neil Lalonde
3c38062802 Check for updates: edge cases when the message on the dashboard doesn't make sense. 2013-07-09 14:01:08 -04:00
Anton Batenev
b0dbb0ea13 And add tests for empty string & null 2013-07-09 20:19:10 +04:00
Robin Ward
5cda0e556c Merge pull request #1111 from jamesaanderson/flash-video-onebox 
Add flash video onebox support
 2013-07-09 06:55:56 -07:00
Robin Ward
f9d1fcb169 Merge pull request #1140 from stephankaag/code_refactoring 
Refactor code that raises deprecating warnings in Rails 4
 2013-07-09 06:48:48 -07:00
Sam
8f892da890 move bookmark to end 2013-07-09 18:16:17 +10:00
Neil Lalonde
806bd98f99 Update category's topic_count immediately when trashing or recovering a topic; this ensures that a category can be deleted without waiting for the category_stats job to run. 2013-07-08 15:23:20 -04:00
Neil Lalonde
9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
Stephan Kaag
2abfd38aee Refactor code that raises deprecating warnings in Rails 4 2013-07-08 18:35:11 +02:00
James A. Anderson & Jalil Mohammed
d51a3cf50f Add flash video onebox as disabled setting by default 2013-07-08 06:37:44 -07:00
Navin
d77ce23de2 Log all changes of user trust level by an admin 2013-07-08 11:53:22 +02:00
Sam
807b9d438a Merge pull request #1159 from jd-erreape/user_refactors 
Refactors in user model
 2013-07-07 23:38:16 -07:00
Sam
f1a31cd9e6 Merge pull request #1163 from ZogStriP/refactor-cooked-post-processor 
refactored CookedPostProcessor
 2013-07-07 22:01:48 -07:00
Sam
d79aa917f1 add option suppress_reply_directly_above to stop suppressing the reply directly above 
added a bunch of debugging information to help diagnose weird positioning issues
 2013-07-08 11:13:45 +10:00
Régis Hanol
ac7253a938 refactor CookedPostProcessor & specs 2013-07-08 01:39:08 +02:00
Juan de Dios Herrero
27b038cd40 Refactored username validations to avoid repeated code 2013-07-07 13:05:18 +02:00
Juan de Dios Herrero
e4fc6e02ed Added discourse hub nickname operations simplify and avoid repeated code 2013-07-07 12:40:35 +02:00
Anton Batenev
4e04c4dddd Add custom headers for email messages 
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
 2013-07-07 04:37:44 +04:00
Régis Hanol
6251935b1e removed auto_link_images_wider_than setting 2013-07-06 22:19:16 +02:00
Robin Ward
1c18490141 Revert "cheat to fix duplicate key on thumbnails" 
This reverts commit 0c702522c4.
 2013-07-05 16:09:43 -04:00
Robin Ward
7335f5fb7f Merge pull request #1145 from abbat/yandex-workaround 
Workaround solution to help Yandex crawler index discourse.
 2013-07-05 10:04:40 -07:00
Anton Batenev
694a6f4970 Fix recommendations from #1145 2013-07-05 15:59:39 +04:00
Sam
0c702522c4 cheat to fix duplicate key on thumbnails 2013-07-05 15:01:31 +10:00
Sam
9afea0ed07 spec for change 2013-07-05 14:23:29 +10:00
Sam
f3ac84d41f our referer is bust if there is no domain 2013-07-05 14:07:08 +10:00
Régis Hanol
7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Anton Batenev
af36d32f7f Workaround solution to help Yandex crawler index discource. 
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
 2013-07-04 22:08:23 +04:00
Sam
ca7c10df9a Merge pull request #1139 from stephankaag/correct_image_url_rails4 
No need to include all ActionView::Helpers in Topic
 2013-07-03 23:29:43 -07:00
Sam
b662cb6c02 If a user read to the end of an auto closing topic, when it is closes just pretend they read the close message. 2013-07-04 11:47:12 +10:00
Neil Lalonde
2c8ed8414c If an auto-closing topic is manually closed, remove the auto-close countdown 2013-07-03 16:54:41 -04:00
Stephan Kaag
7cc7116680 No need to include all ActionView::Helpers in Topic, we only need the sanitize helper. 
This also fixes a bug in Rails 4 where image_url gets accidentally overridden.
 2013-07-03 21:43:29 +02:00
Robin Ward
f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions 
Conflicts:
	app/models/site_setting.rb
 2013-07-03 11:18:42 -04:00
Robin Ward
6364fc74ef Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls 
Conflicts:
	app/services/spam_rules_enforcer.rb
 2013-07-03 11:13:56 -04:00
Robin Ward
05fe33111e FIX: Moving a post should also update its TopicLink records 2013-07-02 16:42:25 -04:00
Robin Ward
22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -04:00
Stephan Kaag
89b621d31a Refactor update_all statements in order to prevent deprecation warnings in Rails 4 2013-07-02 18:36:47 +02:00
Robin Ward
5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
Sam
f6b850e7a4 allow skipping the validations on creation if its an api call AND skip_validations is specified 
this allows wordpress plugin to post very very short titles or titles that would otherwise be disallowed
 2013-07-02 12:23:19 +10:00
Sam
5d4760f91d ruby 1.9.3 compat ... to_h does not exist there 2013-07-01 12:44:46 +10:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Régis Hanol
4de88814d2 bumped default max upload size to 2048Kb 2013-06-30 11:35:33 +02:00
Sam
7681ba0c32 don't fail this query cause avg_time is 0 2013-06-30 01:30:47 +10:00
Neil Lalonde
a352b70bfc Permit changing my own username's case without an error saying it is already taken 2013-06-28 16:21:46 -04:00
Sam
6b82f1047a that date there is on purpose for date boundries 2013-06-28 16:08:48 +10:00
Sam
1ec12fc808 this spec is just refusing to work on jenkins 2013-06-28 16:07:36 +10:00
Sam
3c67cf8acd remove timecop, specs were failing and we can avoid it here anyway 2013-06-28 15:14:44 +10:00
Sam
966513a66d my spec suite has been playing up attempting to clean some stuff by avoiding type checks 2013-06-28 12:18:04 +10:00
Sam
4512956c68 don't run the wrong sentinel on message, message is validated in the post, in effect some flags were being rejected incorrectly 2013-06-28 12:14:40 +10:00
Neil Lalonde
8e50b49cf1 Try to fix specs that are failing in jenkins 2013-06-27 17:23:06 -04:00
Neil Lalonde
948fc62b4a Handle configurable routes for statics in static_controller.js. Make it better when we can use ember's new async routing. 2013-06-27 13:01:12 -04:00
Robin Ward
bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Sam
9fd00cac65 work in progress, add custom faq link, ember router needs to know about this or the redirect trick will not work 2013-06-27 17:15:59 +10:00
Sam
6145e99baa navigate to message fixed, changed to button 
added spec to catch this regression in future
 2013-06-27 16:59:07 +10:00
Neil Lalonde
b1d0f30379 Fix AdminUser bulkApprove; add a way to approve a user without sending them the welcome email for cases when must_approve_users is enabled and there are existing users 2013-06-26 13:24:30 -04:00
Robin Ward
89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde
196a8f4ba5 Add dashboard warnings for system_username and notification_email site settings 2013-06-26 10:57:04 -04:00
Sam
039b4758ac fix 1.9.3 regression, [] does not work on OpenStruct there. 2013-06-26 21:49:29 +10:00
Sam
48d7a33157 Flag UI now displays deleted status for post/topic correctly on old flags 
Commented out a spec that was failing in order random, with a TODO
 2013-06-26 16:18:50 +10:00
Sam
65dc04c00e simplify flag reporting and correct it so it properly displays old flags 2013-06-26 15:57:55 +10:00
Sam
3af12ba7d3 Merge pull request #1088 from ComputerDruid/fix-ipv6 
Fix ipv6 addresses in the database
 2013-06-25 17:25:48 -07:00
Dan Johnson
9f6b7889a8 views: convert 'ip' (bigint) -> 'ip_address' (inet) 
This fixes all known issues when connecting to discourse over IPv6.

This table has no primary key, so the migration is done with update_all,
for each ip address in the views table. Since this table can potentially
grow quite large, this process might take a long time. I don't know any
way around this, though.

This migration uses a SQL command to populate the new field from the old
one, so as not to rely on the View model class, which should keep the
migration from failing if that class is modified in the future.
 2013-06-25 19:47:25 -04:00
Dan Johnson
2e478d8537 TopicLinkClick: convert 'ip' (bigint) -> 'ip_address' (inet) 
When accessed over IPv6, the ip address of the user is a 128-bit number,
too big for PostgreSQL's bigint data type. Since PostgresSQL has the
built-in inet type, which handles both IPv4 and IPv6 addresses, we
should use that instead. Where this is done elsewhere in the codebase,
the column is called ip_address, so we should follow that convention as
well.

This migration uses a SQL command to populate the new field from the old
one, so as not to rely on the TopicLinkClick model class, which should
keep the migration from failing if that class is modified in the future.
 2013-06-25 19:41:19 -04:00
Neil Lalonde
a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Jesse House
06be760257 adds TopMenuItem model which encapsulates top_menu parsing logic 2013-06-24 10:04:18 -07:00
Dmitriy Budnik
d12288de49 adding a missing User association 2013-06-24 17:08:49 +03:00
Sam
25bb8cf382 remove dead uncalled code 2013-06-23 15:28:38 +10:00
Sam
ea932b74e7 values is a much more consistent name than all_values ... we use {}.values not {}.all_values 
also fixes random ordering of tests failure in site settings
 2013-06-23 15:07:49 +10:00
Sam
22d6f6784c Merge pull request #1075 from ZogStriP/fix-lightboxing-when-using-s3 
FIX: lightbox wasn't working when using s3 upload
 2013-06-23 22:11:45 -07:00