Commit graph

18595 commits

Author SHA1 Message Date
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
Sam
d2b3f3d124 some helper files for vim 2013-05-22 15:48:48 +10:00
Tower He
795de0c2d0 Updated zh locales 2013-05-22 13:45:32 +08:00
Sam
da6a88634b improve best filter so it properly excludes all admin messages from count as well 2013-05-22 15:14:47 +10:00
Sam
c4d8085fc5 remove moderator status posts from best feed 2013-05-22 15:04:53 +10:00
Jeff Atwood
519bec6b04 Merge pull request #875 from Supermathie/sysadmin-docs
Add install notes for Ubuntu
2013-05-21 21:03:07 -07:00
Chris Hunt
d0bc8c95d3 Trigger UserActionObserver when tracking visit 2013-05-21 20:45:03 -07:00
Chris Hunt
685f4960f1 Trigger UserActionObserver when updating TopicUser 2013-05-21 20:43:43 -07:00
Michael Brown
85e6151542 install notes: pull down latest release 2013-05-21 23:02:38 -04:00
Sam
d436079801 update active model serializers to latest 2013-05-22 10:36:10 +10:00
Doug Friedman
51fb7cf371 update heroku instructions 2013-05-21 19:09:17 -05:00
Joe Bew
088b5483f9 Updated Italian translation 2013-05-21 19:46:24 +02:00
Robin Ward
45361934b9 User the BasicUserSerializer for the invited user 2013-05-21 12:03:51 -04:00
Robin Ward
046e6e5d86 Simplified grouping on user views, fixed issue with messages not loading on initial load. Really
simplified the restricted user route.
2013-05-21 11:50:01 -04:00
Robin Ward
27828c5ec2 Merge pull request #871 from avdi/refactoring-with-josh-and-avdi
Various refactorings towards Ruby/Rails idiom from Josh Susser and Avdi Grimm
2013-05-21 07:18:50 -07:00
Michael Brown
49f56964ce Further modifications to installation instructions 2013-05-21 09:40:42 -04:00
Michael Brown
f867bd8509 Tweaks to installation documentation 2013-05-21 09:40:42 -04:00
Michael Brown
bda5fc6596 Add Ubuntu installation guide 2013-05-21 09:40:42 -04:00
Robin Ward
a1ff6b3f66 Merge pull request #870 from jasonkriss/patch-1
fix small typo in search_spec
2013-05-21 06:31:31 -07:00
Robin Ward
6f3629d65b Merge pull request #866 from ZogStriP/keep-french-l10n-up-to-date-2013-05-20
keep French l10n up to date
2013-05-21 06:30:53 -07:00
Robin Ward
c9dc23dfb0 Merge pull request #863 from joebew42/it
Server side Italian translation updated
2013-05-21 06:29:54 -07:00
Robin Ward
abe9ebf6ff Merge pull request #868 from jjb/redis-config
make Redis config easier on Heroku
2013-05-21 06:29:17 -07:00
Jason Kriss
c22435562d fix small typo in search_spec 2013-05-21 05:56:04 -03:00
Sam
b5eff93a9d update message bus to support per client filtering
start work on user_tracking_state
fix can_ban? in guardian
expose protected scopes on topic_query we need
move guardian spec to use build as opposed to creating topics / posts / users
start work on user tracking spec
2013-05-21 16:39:51 +10:00
Sam
4ccd89f7df message bus upgrade to support client filters 2013-05-21 12:53:30 +10:00
John Joseph Bachir
7ece167159 redis configurable via ENV
Change heroku docs and tweak redis.yml.sample var name
to accmodate setting redis provider url via configs.
2013-05-20 20:41:33 -04:00
John Joseph Bachir
a2c2d0f5de correct language for code block 2013-05-20 20:41:16 -04:00
Sam
559c1e52aa protect against crash in prd 2013-05-21 10:08:33 +10:00
Jeff Atwood
0b4fc7ebed improve flag threshold reached message slightly 2013-05-20 17:16:35 -07:00
Régis Hanol
7594aef906 keep French l10n up to date
🇫🇷
2013-05-21 00:46:24 +02:00
Jeff Atwood
9f96a4fc58 get the select copy to fit on 1 line 2013-05-20 13:55:08 -07:00
Jeff Atwood
7e3e6ab78d icon tweak on merge/split 2013-05-20 12:34:15 -07:00
Robin Ward
dee45d8dba Changed elementId to be id 2013-05-20 15:31:05 -04:00
Robin Ward
42248a7164 Removed many unnecessary paths that included content.x when just x would do. 2013-05-20 15:27:58 -04:00
Robin Ward
9544cfd7dc target="controller" is unnecessary. By default it will target the controller. 2013-05-20 14:37:05 -04:00
Robin Ward
a79d53c628 Removed many unnecessary controller. uses in templates. 2013-05-20 13:45:14 -04:00