Commit graph

10098 commits

Author SHA1 Message Date
Maxwell Salzberg
9b05e80e3f fix oembed caches so data must be present 2012-01-03 18:00:16 -08:00
Maxwell Salzberg
30b180949d Merge branch 'clean_heroku' 2012-01-03 16:19:03 -08:00
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Jonne Hass
7841d02edd Merge pull request #2580 from robhogg/2565_nsfw_regex
"#nsfw tag filter appears to be case-sensitive"
2012-01-02 14:26:16 -08:00
robhogg
6571ec2fa9 Added test for nsfw? 2012-01-02 21:24:44 +00:00
robhogg
b792a6d3e0 Fixed typo 2012-01-02 21:24:44 +00:00
robhogg
8fbe180446 Modified nsfw? to use case-insensitive regex match. 2012-01-02 21:24:44 +00:00
Jonne Haß
1e8e0b55fd paranthesis ftw, sorry for the noise 2012-01-02 21:17:11 +01:00
Jonne Haß
a8136ed86b d'oh aka --amend 2012-01-02 21:11:47 +01:00
Jonne Haß
cc961d66e2 symbolize smtp_authentication setting to conform to rails docs 2012-01-02 21:08:57 +01:00
Jonne Haß
67b2af0da6 check if ca_file is commented out completly 2012-01-02 21:07:46 +01:00
Jonne Haß
934175c49c updated 15 locale files [ci skip] 2012-01-01 12:55:03 +01:00
danielgrippi
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
Daniel Grippi
ab8fb88e74 Merge pull request #2524 from memarko/patch-2
Update lib/stream/followed_tag.rb
2011-12-31 10:51:51 -08:00
danielgrippi
018d516b48 rescue pubsubhubbub error if your pod is offline (resolves issue when posting public posts in dev mode with no internet connectivity) 2011-12-31 13:47:53 -05:00
Maxwell Salzberg
5bbfebdba9 the invite emailer is not multipart...sigh 2011-12-30 20:54:00 -08:00
danielgrippi
6ab03d33b4 hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions) 2011-12-30 23:51:13 -05:00
Daniel Grippi
27f580f241 Merge pull request #2560 from memarko/patch-3
Update spec/controllers/tag_followings_controller_spec.rb
2011-12-30 18:21:51 -08:00
Jonne Haß
2268a992f7 make serve_static_assets setting configurable 2011-12-29 16:39:17 +01:00
Jonne Haß
4bfd03d6eb remove completly unused redis.yml 2011-12-29 15:53:27 +01:00
Jonne Haß
f774ceae1b do not handle redis stuff in script/server, let the user do it 2011-12-29 15:45:28 +01:00
Sarah Mei
6236fd22a0 Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others. 2011-12-27 14:48:39 -08:00
Jonne Haß
109c5b7a17 this should fix #2552 2011-12-26 23:21:04 +01:00
memarko
399bdb885e Update spec/controllers/tag_followings_controller_spec.rb 2011-12-26 21:51:02 +01:00
memarko
360e041bf6 Update spec/controllers/tag_followings_controller_spec.rb 2011-12-26 19:01:27 +01:00
Jonne Haß
c766163422 pull in ka 2011-12-24 14:12:36 +01:00
Jonne Haß
f4b234088d updated 4 locale files [ci skip] 2011-12-24 14:10:23 +01:00
Jonne Haß
a8357388c9 updated 47 locale files [ci skip] 2011-12-24 00:59:36 +01:00
Jonne Haß
d063db42aa fix app config spec 2011-12-24 00:04:04 +01:00
danielgrippi
5bbbad7c4f added missing pluralizations 2011-12-22 14:30:15 -08:00
Jonne Haß
2817fb95de do not use example config if there's a custom one 2011-12-22 02:03:41 +01:00
Maxwell Salzberg
c258755af5 Merge branch 'remove_splunk' 2011-12-21 14:24:19 -08:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
0866ebb962 remove unused GIT_INFO [ci skip] 2011-12-21 23:19:22 +01:00
Jonne Hass
a23a79f5b5 updated 148 locale files [ci skip] 2011-12-21 13:13:42 +01:00
dangold1138
39d509f4ce Update README.md 2011-12-20 23:19:26 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
danielgrippi
aac97303ce removed duplicate line in a feature [ci skip] 2011-12-20 12:59:15 -08:00
danielgrippi
4ae0dcec43 fix notifications cucumber features 2011-12-20 12:30:29 -08:00
danielgrippi
e9b6da605f fix specs; move presence_of_content validation check into a before_destory to play nicely with federation 2011-12-20 10:42:30 -08:00
Pistos
5110b4c086 Added MySQL-friendly version of SQL code for migration. 2011-12-19 17:12:17 -05:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary. 2011-12-19 17:12:17 -05:00
Pistos
a604dd2aa6 Refactor implementation of #reshare_count.
The old implementation which uses Post.where causes

  undefined method `abstract_class?' for Object:Class

in spec/controllers/posts_controller_spec.rb.  Not sure whether that's a problem
with Rails, or rspec, or what.
2011-12-19 17:12:17 -05:00
Pistos
51566ebe0b Improve wording of error message in Reshare#root_must_be_public validation. 2011-12-19 17:12:17 -05:00
Pistos
a9c6905e29 Made spec text correspond to actual text tested. 2011-12-19 17:12:17 -05:00
Pistos
99f2d4f018 Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original"). 2011-12-19 17:12:17 -05:00
Pistos
90d960bac7 Some reshare_link specs. 2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44 Always show "Reshare original" for link. Show number of reshares in the post_initial_info div.
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared.  Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares".  Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
2011-12-19 17:12:17 -05:00