Commit Graph

2530 Commits

Author SHA1 Message Date
Robin Ward f69993ddb7 Merge pull request #894 from GlitchMr/contributing
Move CONTRIBUTING to main directory, so GitHub would see it
2013-05-24 07:01:16 -07:00
Robin Ward 79c6da0329 Merge pull request #893 from kubabrecka/cs_update45
cs translation update
2013-05-24 06:59:30 -07:00
Sam a1520f0dee implement save :) 2013-05-24 21:04:26 +10:00
Konrad Borowski 20b4f733aa CONTRIBUTING.md is now outside docs 2013-05-24 12:45:14 +02:00
Konrad Borowski ea47bc4363 Insert CONTRIBUTING link to main directory, so GitHub would see it 2013-05-24 11:20:03 +02:00
Kuba Brecka 0b09a52b31 cs translation update 2013-05-24 10:04:27 +02:00
Sam a8ae81df4b sorry this is meant to be staff styling :) 2013-05-24 13:32:57 +10:00
Sam 9926b0dbc8 staff styling 2013-05-24 13:32:41 +10:00
Sam ca2dee52db moved comments to the bottom, they are way less intrusive there 2013-05-24 12:48:32 +10:00
Sam 2cd95bc649 lets try out annotations 2013-05-24 12:35:14 +10:00
Sam dd1ad508cf Merge branch 'master' of github.com:discourse/discourse 2013-05-24 12:33:47 +10:00
Sam 6fc4f5dad9 Merge pull request #889 from bradly/switch_from_depricated_rvmrc
Swtich from depreciated .rvmrc to moe standard .ruby-version and .ruby-gemset
2013-05-23 18:28:10 -07:00
Sam fc3c93d237 almost fixed the regression of not allowing top level filters 2013-05-24 09:54:39 +10:00
Robin Ward 84fd366322 Navigating should set a searchContext (unused right now). 2013-05-23 18:51:40 -04:00
Robin Ward eb0c102931 Migration logic from SearchView to a controller, where it should be. 2013-05-23 17:42:57 -04:00
Erik Ordway 0bdee973a0 allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional 2013-05-23 13:44:14 -07:00
Erik Ordway 1575ce7b10 add cas support with a few tests 2013-05-23 13:40:50 -07:00
Robin Ward 9d0e830786 Search code now uses ActiveRecord instead of SQL. 2013-05-23 16:26:51 -04:00
Konrad Borowski 8bc4264c98 Thread title fixer should ignore special cases like iLetter 2013-05-23 21:31:08 +02:00
Robin Ward 8e8d9af2bf Use classes instead of a complicated nested hash for search results 2013-05-23 12:44:47 -04:00
Bradly Feeley 56dfc7c5a1 rvm has offically depreicated .rvmrc and recommends using .ruby-version and .ruby-gemset instead. 2013-05-23 09:16:11 -07:00
Navin 9aacde2f2d Refactor Post#save_reply_relationships 2013-05-23 18:09:06 +02:00
Navin ba4eaa0297 Helper to create reply relationship with post 2013-05-23 18:08:24 +02:00
Navin d7219a6fbc Helper to add a number to quoted_post_numbers 2013-05-23 18:07:45 +02:00
Neil Lalonde 4492d06a9f Don't send notifications for moderator action posts 2013-05-23 11:42:52 -04:00
Robin Ward a08d4e4512 Merge pull request #883 from tangramor/master
update the zh_CN & zh_TW locales
2013-05-23 07:28:59 -07:00
Robin Ward 0bd61df34c Merge pull request #884 from mattvanhorn/refactor_topic
Refactor topic
2013-05-23 07:26:22 -07:00
Matt Van Horn c4b5821ef8 Revert annotation and non-English I18n changes 2013-05-23 06:44:47 -07:00
Sam 3dfc034e8d Merge pull request #881 from novemberkilo/master
Improve flog metric for Post#extract_quoted_post_numbers
2013-05-23 00:21:27 -07:00
Matt Van Horn 24c25895f0 remove unnecessary title quality tests from topic 2013-05-22 22:56:27 -07:00
Matt Van Horn 7271b90655 annotate topic model 2013-05-22 22:36:01 -07:00
Matt Van Horn 806255b3c4 refactor Topic validation
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
2013-05-22 22:31:52 -07:00
Sam fcc7192fd2 User tracking state implementation progress for live unread / new counts 2013-05-23 15:22:06 +10:00
tangramor 9df4ad794e update the locale of zh_CN & zh_TW 2013-05-23 10:56:49 +08:00
Jeff Atwood cdbe6f64c7 minor copy changes 2013-05-22 16:30:41 -07:00
Robin Ward 5b1a767a5a Merge pull request #882 from bsides/patch-1
Just fixed a typo and added a warning
2013-05-22 14:25:23 -07:00
bsides 1b12ebb11e Just fixed a typo and added a warning
Honest mistake I took from pasting it from my own system :)
2013-05-22 18:13:57 -03:00
Robin Ward 7f7a770f3b Merge pull request #880 from bsides/patch-1
Adding Apache2 + Passenger instead NGINX
2013-05-22 13:35:43 -07:00
Robin Ward 7a31630837 Search Refactor: Remove some manual SQL, make search data tables more idomatic Rails/AR 2013-05-22 16:31:13 -04:00
Navin 4754216369 Simplify branching 2013-05-22 21:45:31 +02:00
Navin ef93512de8 Extract quote parsing into a method 2013-05-22 21:38:45 +02:00
Robin Ward b9a310f4b1 Search Refactor: Let's use a class to keep track of our state rather
than passing params everywhere. Also make the private API private.
2013-05-22 15:22:06 -04:00
bsides c3de4cd35d Adding Apache2 + Passenger instead NGINX 2013-05-22 13:09:51 -03:00
Robin Ward 0f296cd42b Refactor + Fix: Wasn't correctly loading activity streams. Code is a lot more Ember-y now. 2013-05-22 12:06:37 -04:00
Sam 89a617f0c6 Merge pull request #879 from mattvanhorn/refactor_guardian
refactor guardian class for clarity & correctness
2013-05-22 01:51:01 -07:00
Matt Van Horn 872995db57 refactor guardian class for clarity & correctness
introduce NullUser to avoid type-checking
DRY up code
reduce number of multiple returns
remove some redundant/impossible logic branches
add pending test for possible bug
add test & fix for ability to flag archived posts
add #secure_category? method to topic class
Fix bug that prevented flagging of archived topics
Rename NullUser to AnonymousUser
DRY up can_<action>? methods
Fix some ownership logic, and a test, for Guardian
2013-05-22 01:09:34 -07:00
Sam 6e95ef8196 Merge pull request #874 from realdoug/master
Update Heroku deployment instructions
2013-05-21 23:05:09 -07:00
Sam cb2068e448 Merge pull request #872 from joebew42/client_it
Updated Italian translation
2013-05-21 23:03:50 -07:00
Sam 0a66c4db3c Merge pull request #878 from emberjs-cn/update-zh-locales
Updated zh locales
2013-05-21 23:02:45 -07:00
Sam 96f8d79e83 Merge pull request #876 from chrishunt/chrishunt/observe-changes-for-topic-users
Trigger UserActionObserver when updating TopicUser
2013-05-21 23:02:27 -07:00