IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,256 Commits 1,018 Branches 579 Tags
f7f9406b83384305f04befc3afcb177dad180bc6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward 28c168fc2b FIX: Unintended edits with composer 2013-07-04 13:35:15 -04:00
Robin Ward ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels 
Feature: Admin can modify user trust levels
 2013-07-04 06:57:59 -07:00
Robin Ward 7504da13e3 FIX: Whitespec in specs changed. We should really figure out a better way of ensuring correctness here. 2013-07-03 19:24:49 -04:00
Robin Ward 06e5615088 OOPS! Robin self-flaggelated. 2013-07-03 19:13:13 -04:00
Robin Ward f5d6b41f91 FIX: posts weren't being marked as last read correctly 2013-07-03 19:03:11 -04:00
Robin Ward 4331bba549 FIX: Quotes with text against them had the wrong spacing 2013-07-03 18:26:08 -04:00
Robin Ward 44cd5505d3 FIX: Repeatedly editing a post was popping up abandon dialog 2013-07-03 15:57:23 -04:00
Robin Ward ba0bd934ba FIX: Links to images in posts won't go through the Discoruse router 2013-07-03 14:06:34 -04:00
Robin Ward b0e10673a2 FIX: Small bugs with progress indicator 2013-07-03 12:31:00 -04:00
Robin Ward ffac22a143 FIX: Support underscores in autocomplete widget 2013-07-03 11:48:59 -04:00
Robin Ward c7ac11458b FIX: Removed some leftover posts references outside of the stream 2013-07-03 11:29:29 -04: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 07791ea471 Fix update statement for Rails 4 preparation 2013-07-03 11:17:16 -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 c12e87650d Merge pull request #1130 from adrianlang/patch-1 
Fix German translation of user_automatically blocked template
 2013-07-03 08:06:15 -07:00
Robin Ward 3f28edbd32 Merge pull request #1132 from ThomasHarper/patch-8 
Update client.fr.yml
 2013-07-03 07:58:35 -07:00
Robin Ward ce0a7739cf FIX: Invalid Unicode in preload store JSON 2013-07-02 20:43:52 -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
Robin Ward 9c552c39a2 FIX: CSS for post selection was off in lower resolutions 2013-07-02 15:29:05 -04:00
Robin Ward 7f70bc3bbd Add discourse.forum to all List-Ids 2013-07-02 15:21:34 -04:00
Robin Ward fab1be7c8e Adds a List-Id header to outgoing mail 2013-07-02 14:13:46 -04:00
Robin Ward 1308dbbef7 FIX: Quote popup broke in refactor 2013-07-02 13:36:38 -04:00
Robin Ward a04924deea FIX: Progress wasn't docking properly 2013-07-02 13:10:38 -04:00
Robin Ward 064efa1671 FIX: Progress bar updates faster 2013-07-02 12:46:49 -04: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
Robin Ward d051e35000 Merge pull request #1117 from maddenwg/improve-docs 
add step to drop and recreate database before changing seed Edit
 2013-07-02 07:10:09 -07:00
Robin Ward 9820e1b046 Merge pull request #1129 from merugear/patch-1 
Changed grammar on powered_by_html
 2013-07-02 07:07:28 -07:00
Robin Ward 023d18cab2 FIX: Admins should be able to post short titles. This is especially important for when syndicating 
a blog via the wordpress plugin into Discourse.
 2013-06-29 17:57:10 -04:00
Robin Ward e076661759 Merge pull request #1110 from ZogStriP/fix-updating-min-topic-title-length-needs-a-restart 
FIX: updating  needs a restart
 2013-06-29 14:10:49 -07:00
Robin Ward 8fa3eaea13 Merge pull request #1112 from jamesaanderson/use-existing-method 
Use existing image_html method
 2013-06-29 14:06:27 -07:00
Robin Ward e6e16c74b5 Merge pull request #1113 from ZogStriP/patch-1 
Update search_result.rb
 2013-06-29 14:04:01 -07:00
Robin Ward 2deaf8ef98 Custom Wordpress Serializer and Path, with Specs 2013-06-28 13:56:13 -04:00
Robin Ward 6106057328 FIX: Can view best filter while logged in 2013-06-28 12:20:06 -04:00
Robin Ward 721ec5002d Merge pull request #1106 from ThomasHarper/patch-7 
Update client.fr.yml
 2013-06-28 07:46:02 -07:00
Robin Ward 4711c75e53 Merge pull request #1103 from royguo/patch-1 
Update server.zh_CN.yml
 2013-06-28 07:21:50 -07:00
Robin Ward 251d169c0d Merge pull request #1104 from ThomasHarper/patch-5 
Update client.fr.yml
 2013-06-28 07:21:10 -07:00
Robin Ward ce5fad3ccc Merge pull request #1105 from ThomasHarper/patch-6 
Update client.fr.yml
 2013-06-28 07:20:49 -07:00
Robin Ward bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Robin Ward d13166fa17 Merge pull request #1095 from Mikulas/typo-translation-czech 
Minor typo fix in czech translation
 2013-06-27 07:08:57 -07:00
Robin Ward 89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Robin Ward 9a19c0d9c4 Fix for multiple paragraph emails with text em-dashes in them (--). 2013-06-25 14:06:05 -04:00
Robin Ward 3067c2ed3b Private messages have instructions for reply by email. We also strip X-Discourse headers 
before sending the message as they are no longer needed.
 2013-06-25 11:35:26 -04:00
Robin Ward 3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Robin Ward 62daeedf08 Merge pull request #1092 from ZogStriP/rolling-back-markdown-conversion-pipeline-order-changes 
reverting changes to the markdown conversion pipeline order
 2013-06-25 08:20:10 -07:00
Robin Ward a4e8a828c8 Merge pull request #1091 from mfeckie/refactor-tests 
Refactor tests
 2013-06-25 07:31:19 -07:00
Robin Ward 0c4de24dd5 Merge pull request #1086 from budnik/facebook_user_info_assoc_was_missing 
adding a missing User association
 2013-06-24 07:15:20 -07:00
Robin Ward b56f8a0176 Merge pull request #1085 from ThomasHarper/patch-4 
Update server.fr.yml
 2013-06-24 06:45:41 -07:00
Robin Ward bad7707cf3 Merge pull request #1082 from ThomasHarper/patch-2 
Update client.fr.yml
 2013-06-24 06:28:51 -07:00
Robin Ward 4b638a0fea Merge pull request #1083 from ThomasHarper/patch-3 
Update client.fr.yml
 2013-06-24 06:27:59 -07:00
Robin Ward adce747d1b Merge pull request #1084 from abbat/master 
Russian translation (actual version)
 2013-06-24 06:27:11 -07:00
Robin Ward 1b8c9d2efd Merge pull request #1077 from jamesaanderson/jump-to-last-post-in-best-of-mode-fix 
Jump to last post in "Best of" mode fix
 2013-06-24 06:26:44 -07:00
Robin Ward 456cff17f8 FIX: If the image has no thumbnail, don't update the src 2013-06-21 14:32:42 -04:00
Robin Ward 82c21868f3 Moved JSHint into Qunit suite. It's much harder to forget about now! 2013-06-21 14:07:11 -04:00
Robin Ward bb908d5913 Email parsing uses Traditional Markdown Linebreaks by default. Added JS tests for line breaks. 2013-06-21 11:37:26 -04:00
Robin Ward 455742d3ee Merge pull request #1062 from ComputerDruid/fix-which-s 
Use "command -v" to test for convert instead of "which -s"
 2013-06-21 07:12:42 -07:00
Robin Ward 8dceb655db Merge pull request #1058 from ZogStriP/delete-optimized-images-when-cleaning-up-orphans 
make sure we also delete optimized images
 2013-06-21 07:10:28 -07:00
Robin Ward e216e2361b Merge pull request #1064 from jamesaanderson/master 
Video onebox
 2013-06-21 07:09:58 -07:00
Robin Ward 601c35fc58 Merge pull request #1067 from adkron/feature/supress_to_suppress 
Correct spelling of suppress
 2013-06-21 07:08:12 -07:00
Robin Ward 3257bef387 Category List and Topic View Integration Test 2013-06-20 15:02:26 -04:00
Robin Ward d78898443d Oops: Forgot debugging information in scrolling handlers 2013-06-20 14:32:22 -04:00
Robin Ward a8b5716421 FIX: Coudln't scroll while on Qunit page due to browser bindings 2013-06-20 14:29:59 -04:00
Robin Ward 4cd71972be Cleaned up QUnit test structure 2013-06-20 13:58:54 -04:00
Robin Ward 0e984762d5 Oops, forgot to check in the email fixtures :P 2013-06-20 13:07:42 -04:00
Robin Ward cc90939aa8 Merge pull request #1056 from cezarcp/text_logo 
Allow to use a text logo when logo_url setting is set to an empty value
 2013-06-20 10:00:47 -07:00
Robin Ward 6c37a8f8fb Merge pull request #1055 from vipulnsward/dedeuplicate_app_controller 
Remove code duplication in ApplicationController
 2013-06-20 09:55:09 -07:00
Robin Ward 4aa20cf23c Merge pull request #1053 from vipulnsward/remove_var 
Remove unused var.
 2013-06-20 09:54:34 -07:00
Robin Ward 0d10b5c9c4 More email receiving logic 2013-06-20 12:38:37 -04:00
Robin Ward 9f3d5b9f1e Merge pull request #1044 from ZogStriP/clean-orphan-uploaded-files 
added a rake task to clean orphan uploaded files
 2013-06-20 07:53:50 -07:00
Robin Ward 8e6a903f9b Merge pull request #1046 from house9/admin-user-index-2 
extract Admin::UsersController#index to its own query class
 2013-06-20 07:52:22 -07:00
Robin Ward 2e7c5a674c Merge pull request #1049 from ZogStriP/admin-alerts 
Admin alerts
 2013-06-20 07:51:40 -07:00
Robin Ward 7641b3f3ef Merge pull request #1052 from abbat/master 
Force UTF-8 charset in nginx error pages
 2013-06-20 07:43:00 -07:00
Robin Ward 285e27fe84 OOPS: Invalid YAML 2013-06-19 18:22:14 -04:00
Robin Ward 7772ef7529 Change travis to use qunit 2013-06-19 18:19:36 -04:00
Robin Ward 8c4aac7f94 Migrate all jasmine specs to Qunit. Removed Jasmine. 2013-06-19 18:18:35 -04:00
Robin Ward d5643551cc Remove dependency on Webrick for QUnit tests 2013-06-19 14:36:26 -04:00
Robin Ward 5ef6714d48 New site setting: minimum_topics_similar, allows you to specify a minimum amount 
of topics that need to be in the database before it will suggest similar topics as
a user creates a post.
 2013-06-19 13:14:24 -04:00
Robin Ward 00666a596f Merge pull request #1047 from wycats/patch-1 
Change "unicode" terminology to "UTF-8"
 2013-06-19 09:46:14 -07:00
Robin Ward 82d1465d18 Ugly Hack: Remove improperly parsed headers from Mail::Message 2013-06-19 12:14:01 -04:00
Robin Ward d5191adfc9 Remove useless jasmine spec 2013-06-18 18:08:37 -04:00
Robin Ward 62e21b8175 Markdown moved to Qunit 2013-06-18 18:05:08 -04:00
Robin Ward 87024c8676 Allow reply by email for admins in PMs 2013-06-18 17:26:33 -04:00
Robin Ward f0ebca51cc Moved Formatter, KeyValueStore and Onebox jasmine tests to QUnit. 2013-06-18 17:23:00 -04:00
Robin Ward 8af9952b25 Change all headers to X-Discourse-* instead of Discourse-* 2013-06-18 15:54:02 -04:00
Robin Ward 60fce196c7 More Qunit tests including a CLI runner 2013-06-18 13:44:20 -04:00
Robin Ward 8e96299653 FIX: Discourse.Presence was broken on arrays. The flag button was showing for anonymous users. 2013-06-18 11:36:48 -04:00
Robin Ward 04998a6687 FIX: Referenced job incorrectly in clockwork 2013-06-18 10:05:15 -04:00
Robin Ward e6cd835928 Merge pull request #1040 from vipulnsward/remove_and 
Remove unnecessary anding with true
 2013-06-18 06:37:33 -07:00
Robin Ward b9a2469774 Merge pull request #1041 from vipulnsward/refactor_topics_controller 
Refactor `TopicsController` and remove code duplication
 2013-06-18 06:35:32 -07:00
Robin Ward 4a9499c9f4 FIX: Trailing paren missing. Thanks Régis! 2013-06-17 17:15:11 -04:00
Robin Ward 8acdc18bc8 First stab at polling support for POP3S / reply by email 2013-06-17 16:49:02 -04:00
Robin Ward 3c7eb3a4e8 FIX: null dates crashed the client app. last_posted_at was not updating properly on split topic. 2013-06-17 13:02:50 -04:00
Robin Ward b0cc45b14e FIX: Long line in JS fixtures 2013-06-17 11:59:04 -04:00
Robin Ward c2d9d95237 FIX: Dates in the history window shouldn't wrap in spans 2013-06-17 11:56:50 -04:00
Robin Ward 797b99db7c Moved a bunch of tests to QUnit. Added basic Discourse.Site support to test suite. 2013-06-17 11:38:30 -04:00
Robin Ward 5703e3923c FIX: Wrong key for translation file. 2013-06-16 16:08:36 -04:00
Robin Ward 4b250dfd33 Merge pull request #1028 from vipulnsward/mute_variable_suppression 
`toggle_mute` doesn't require a param
 2013-06-16 12:50:53 -07:00
Robin Ward d0c311e1c4 Merge pull request #1029 from bkerensa/patch-1 
Capitalization and Minor Improvements
 2013-06-16 12:49:29 -07:00
Robin Ward 08b64faa7f Merge pull request #1031 from kubabrecka/cs_update46 
cs translation update
 2013-06-16 12:46:20 -07:00
Robin Ward ee9af728e3 Merge pull request #1035 from erlend-sh/master 
WIP: Added Norwegian Bokmål translation, 50%
 2013-06-16 12:45:42 -07:00