nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13731 commits 4 branches 0 tags 121 MiB
Commit graph

1606 commits

Author SHA1 Message Date
Maxwell Salzberg
3179ebabc9 fix tag stream 2011-10-15 22:37:53 -07:00
Maxwell Salzberg
58d496e146 MS SM WIP 2011-10-15 22:11:23 -07:00
Maxwell Salzberg
e1aa709c85 MS SM fix ajax_stream? 2011-10-15 21:49:17 -07:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
1e26f5d045 Merge pull request #2175 from Pistos/postgresql-fix-fb_connected_distribution_sql 
Postgresql: Fix fb_connected_distribution_sql
 2011-10-15 03:27:57 -07:00
Maxwell Salzberg
e0ee200eb7 ajax that stream if you are not cachin' outrageous 2011-10-14 16:03:20 -07:00
Maxwell Salzberg
d4e36167f5 remove featured users for now 2011-10-14 15:59:23 -07:00
Maxwell Salzberg
934b47cadb lets try not ajaxing the stream because the cache is superfast 2011-10-14 14:28:46 -07:00
Maxwell Salzberg
bde5fd205c MS DG fix soup, memoize posts 2011-10-14 14:23:18 -07:00
Maxwell Salzberg
5a8024a71a MS DG; some stream refactoring; can comment now exists in base stream; default behavior is to allow you to comment on locals post, and then remote people if you are connected with them 2011-10-14 11:50:38 -07:00
Maxwell Salzberg
01d7b9507b DG MS; ajax in the soup 2011-10-14 11:17:25 -07:00
Maxwell Salzberg
14c5f1c564 MS DG; only select the ids for soup query 2011-10-14 11:08:47 -07:00
Maxwell Salzberg
56dc565fc7 yeah I need to commit the files i guess 2011-10-13 22:27:07 -07:00
Maxwell Salzberg
f959ca0c12 refactor streams to be in a Stream module, hopefully they will auto-reload now 2011-10-13 22:26:15 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Pistos
455e59e442 Introduce #fb_connected_distribution to make statistics_spec.rb pass under PostgreSQL. 
Statistics can still be gathered the same way when MySQL is being used; no alteration there.
 2011-10-12 22:36:42 -04:00
Pistos
bc48ed16f9 Add users.sign_in_count to GROUP BY clause in #fb_connected_distribution_sql. (How did this even work without it?) 2011-10-12 22:33:46 -04:00
Ilya Zhitomirskiy
d5d4b9d555 Merge pull request #2145 from bagilevi/fix-omniauth-rack-bug-1824 
Fixes omniauth & rack-1.2 bug #1824
 2011-10-12 16:13:51 -07:00
Pistos
a60e74f339 Fixed "string vs. integer" spec breakage in spec/models/user/querying_spec.rb . 2011-10-12 11:37:01 -04:00
Gonzalo Rodriguez
f0b219f474 More simple tags_stream title. Was insane when following a lot of tags :D 2011-10-12 03:39:27 -02:00
Gonzalo Rodriguez
27d9e7a8c6 Remove this, since selected aspects are now handled in the session hash 
Not only this code is unnecessary with the new way selected
aspects are stored, also on some edge cases could confuse the user
for example when having two tabs opened and hitting refresh in one
of them. Expecting selected aspects, but the "a_ids[]"-like url could
instead set the new group of selected aspects.
 2011-10-12 02:58:42 -02:00
Ilya Zhitomirskiy
8cd5fef1a6 one more csv generator option 2011-10-11 18:57:02 -07:00
Maxwell Salzberg
cfb28db00f wip, but the refactored code works 2011-10-11 16:12:32 -07:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Maxwell Salzberg
963d5c1a69 wip 2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Ilya Zhitomirskiy
fa44ff6931 added query 2011-10-11 15:46:13 -07:00
Pistos
ed9328450a Make statistics work under PostgreSQL. 2011-10-11 17:48:57 -04:00
Pistos
76ab5b2efb Whitespace cleanup. 2011-10-11 17:48:33 -04:00
Ilya Zhitomirskiy
86e52b0799 remove statstample; made our own correlation function 2011-10-11 12:03:35 -07:00
Ilya Zhitomirskiy
6a5f448853 added comment count correlation 2011-10-11 11:31:46 -07:00
Ilya Zhitomirskiy
5f324f73a0 remove correlation for tags_followed due to missing index 2011-10-11 11:18:42 -07:00
Ilya Zhitomirskiy
7fb26c4390 dg iz limiting to one month, added contacts sharing with count 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
288d20b6e8 correlations on the admins page 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
danielgrippi
818167c565 DG IZ; wip 2011-10-11 10:57:26 -07:00
The Lambda Calculus
e7828dcae8 Squashed commit of the following: 
commit 740296e86fdd080e6e787c5c024a6b609782d82f
Author: The Lambda Calculus <code@thelambdacalculus.net>
Date:   Mon Oct 10 16:49:35 2011 -0400

    Wrote rspec for atom feed validation. [Finishes issue #1408]

commit e2999cbe588bcb32f35f05120743627cf3b31f56
Author: The Lambda Calculus <code@thelambdacalculus.net>
Date:   Thu Sep 29 18:28:14 2011 -0400

    Adjusted placement of invalid 'link' elements outside of 'author' element. Feed now validates, though warnings/suggestions still exist. [Issue #1408]
 2011-10-11 01:43:11 -04:00
Levente Bagi
6e60d932c0 Fixes omniauth & rack-1.2 bug #1824 
Rack 1.2's request.url method is buggy, as it gets the host part from
HTTP_X_FORWARDED_HOST, but the port from SERVER_PORT (which should be
used in conjuction with SERVER_ADDR).

This way, if the app is run behind a reverse proxy, it will create a
URL with <public_host>:<private port>, and pass this to Facebook,
so Facebook will redirect back to the URL with the wrong port.

Upgrading Rack requires upgrade to Rails 3.1.

This temporary solution configures OmniAuth using a copy of the newer
version of Rack::Request.
 2011-10-09 01:03:22 +01:00
Maxwell Salzberg
0da3fbcf66 fix some cases where the parent is nil in relayable retractions 2011-10-07 13:45:20 -07:00
danielgrippi
2baa1e7c6e remove hidden posts from the cache; add unhidden posts to the cache 2011-10-06 19:14:08 -07:00
Gonzalo Rodriguez
cf01d03656 Avoid crashing if no featured users are configured 2011-10-07 00:06:12 -02:00
Ilya Zhitomirskiy
018a42b001 assert that prep_opts works; reference BaseStream types in lieu of subclassed AspectStream's 2011-10-06 17:26:29 -07:00
Ilya Zhitomirskiy
7572eaaf0d changed the default order in prep_opts, passing in opts to cache population 2011-10-06 17:14:14 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Ilya Zhitomirskiy
91a0af078c added checking for the sharing contact in postzord caching 2011-10-06 12:31:09 -07:00
Ilya Zhitomirskiy
d891e78652 refactored post receiving; only update cache on verfied received objects 2011-10-06 12:31:09 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
d7bd26fdf3 MS SM only show accpetable types of posts in the featured users stream 2011-10-05 21:22:10 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Maxwell Salzberg
b911047d7d sorry left some puts 2011-10-05 18:12:11 -07:00
Maxwell Salzberg
58ca760a64 fix small bug with html only emails 2011-10-05 18:11:35 -07:00
Maxwell Salzberg
75aa3f8f97 include people names in the from field 2011-10-05 17:12:31 -07:00
Ilya Zhitomirskiy
fd8476fe9c fixed clear cache rake task + puts 2011-10-05 12:09:42 -07:00
Maxwell Salzberg
d91ea4b9ce adding support for message bus email service 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Ilya Zhitomirskiy
f4bfa22768 added a clear cache rake task, removed fake redis for mockredis, slight 
refactor of the redis_cache class
 2011-10-05 11:54:24 -07:00
Ilya Zhitomirskiy
0d00265392 temporarily disable redis caching during seed script 2011-10-05 10:39:24 -07:00
Ilya Zhitomirskiy
f98ff61e16 fix cache updating on post creation for a user 2011-10-04 18:48:38 -07:00
Maxwell Salzberg
a3eeb9f3c1 comment on tagged posts wip 2011-10-04 18:20:15 -07:00
maxwell
eef054dc5e wip 2011-10-04 18:20:14 -07:00
Ilya Zhitomirskiy
792647340f added acceptable_types to the cache 2011-10-04 16:51:18 -07:00
Ilya Zhitomirskiy
af5c33f5a5 only cache types associated in AspectStream 2011-10-04 16:18:41 -07:00
Ilya Zhitomirskiy
ab8308b9df moved configured check into the RedisCache class 2011-10-04 15:46:03 -07:00
Maxwell Salzberg
11b1b44b22 fix file require 2011-10-04 15:33:29 -07:00
Ilya Zhitomirskiy
97342630c4 dg iz added some more documentation and only caching on all aspects 2011-10-04 14:39:56 -07:00
Ilya Zhitomirskiy
6ea540fb94 wip, adding to cache in receiver, caching is only triggered for receiving of posts 2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy
7926ebfb53 subclassing receivers, renamed perform to perform [bang] 2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy
289d582ce9 redis cache populates 2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy
01515725fe WIP trim is still needed, also possible weirdness with the mock 2011-10-04 10:32:16 -07:00
Ilya Zhitomirskiy
8d12a57f37 reding from redis cache 2011-10-04 10:32:16 -07:00
Maxwell Salzberg
34f82d8bc1 try an in query directly for the tags 2011-10-03 17:14:57 -07:00
Gonzalo Rodriguez
0aa49a8d73 Missing whitespace 2011-10-03 22:06:03 -02:00
Maxwell Salzberg
dd1a1c15bb dont use instance vars when you have accessor methods 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
01fd1f23c7 moving stuff around 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
1d2439ee76 clean up stream directory structure 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
cd93a29377 small cleanup 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Dan Hansen
84ff366fef make all links open in new tab. fix #1984 2011-10-02 22:24:35 -05:00
Maxwell Salzberg
5348c72209 add sqlite method; fix chubbies cukes 2011-09-30 14:27:54 -07:00
Maxwell Salzberg
621075d4e1 fix mentioning from profile page spec, add some tests for the ajax_stream? method 2011-09-30 10:54:13 -07:00
Maxwell Salzberg
6ac0a46120 green jasmine by stubbing ajax_stream? in aspects controller 2011-09-29 18:04:21 -07:00
Ilya Zhitomirskiy
c3746aec7f passing around arrays instead of object on local batch receive 2011-09-28 21:34:48 -07:00
Maxwell Salzberg
78557c02e9 dealing with slow code by commenting it out 2011-09-27 17:19:38 -07:00
Ilya Zhitomirskiy
faa0451380 Revert "not passing in by members of if it wasn't passed into the stream" 
This reverts commit ff1cb665ed.
 2011-09-23 09:59:05 -07:00
Ilya Zhitomirskiy
ff1cb665ed not passing in by members of if it wasn't passed into the stream 2011-09-22 16:26:45 -07:00
Ilya Zhitomirskiy
3e51fca9c0 updated the rake task to pull back full name 2011-09-20 18:53:19 -07:00
Ilya Zhitomirskiy
2cebfa54cc fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher) 2011-09-19 15:52:25 -07:00
Sarah Mei
18b1f360d8 Have our CI run only cucumber 2011-09-17 22:39:42 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
cbbaa2f80d more verbose not valid object error 2011-09-16 16:43:03 -07:00
Maxwell Salzberg
f963e4cb4e get better info on failing federated posts 2011-09-16 16:18:14 -07:00
Maxwell Salzberg
defeb42721 get some comma seperated resque job logging for method params in hoptoad" 2011-09-16 15:22:20 -07:00
Maxwell Salzberg
17b5e7b066 move admin rack to its own file 2011-09-16 13:33:05 -07:00
Maxwell Salzberg
1343188ccb dont do the comments in a transaction, we build other jobs 2011-09-16 11:26:28 -07:00
Maxwell Salzberg
6c414d8562 add tests for object_should_be_processed_as_public? and delegegated public to the parent of relayable objects 2011-09-16 11:24:13 -07:00
Jonne Hass
01f7625649 fix Postzord::Dispatcher#object_should_be_processed_as_public? 2011-09-16 19:44:41 +02:00
Ilya Zhitomirskiy
f1a8b1fd6f added the namespace constraint back to the envelope, protocol route, data type is now plain xml 2011-09-16 08:53:13 -07:00
Ilya Zhitomirskiy
c98189b057 refactored the salmon models and the xml, added a pending spec to strip '=' 2011-09-16 08:53:13 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b7288c8d8e removed the algo field and a commented line 2011-09-16 08:53:13 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
4cdfe8431b signing with SHA256, have a temp fallback on verification 2011-09-16 08:53:13 -07:00
danielgrippi
ce9c17fa2e use ActiveSupport's Base64 encoding methods instead of calling Array#pack directly; strip new lines. 2011-09-16 08:53:13 -07:00
danielgrippi
36f5e45c25 change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00
danielgrippi
58abbcc058 DG MS; activate dispatcher switch in Dispatcher; remove diasporahq blocker 2011-09-16 08:53:13 -07:00
danielgrippi
999efbd451 IZ DG MS; fix method call in public receiver 2011-09-15 19:37:56 -07:00
danielgrippi
ba8e50e34c DG MS; renamed a file; fixed the build 2011-09-15 15:16:34 -07:00
danielgrippi
70deed01e1 fixed comment notifications / dispatching 2011-09-15 14:25:15 -07:00
danielgrippi
97f80272b2 DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class 2011-09-15 12:42:53 -07:00
danielgrippi
ec011f0800 DG MS; optimized local comments to be batched; backfilled more tests 2011-09-15 11:22:47 -07:00
danielgrippi
e4f7bc7216 local_people should always return an array (re: injection issues) 2011-09-14 22:18:08 -07:00
danielgrippi
f519639010 safeguard against local users being nil in dispatcher 2011-09-14 22:11:52 -07:00
danielgrippi
930ea6c425 Fix failure, decode in receiver 2011-09-14 21:41:46 -07:00
danielgrippi
707118d8b5 default to postgres db in heroku rake task 2011-09-14 18:46:03 -07:00
danielgrippi
a396ad811f remove debug line 2011-09-14 18:21:54 -07:00
danielgrippi
cb7bc0ecad add debug line 2011-09-14 18:09:36 -07:00
danielgrippi
a99a174d5f alias jobs:work 2011-09-14 18:07:54 -07:00
danielgrippi
57079ef5cd set ENV['HEROKU'] explicitly in the heroku:config task 2011-09-14 18:05:40 -07:00
danielgrippi
ba63c028e6 added heroku gem, slugignore, and heroku rake task to load application.yml vars as config vars 2011-09-14 18:05:40 -07:00
danielgrippi
fab6f9ccd9 DG MS; fixed tests; explicitly send in dispatcher in httpmulti 2011-09-14 17:51:25 -07:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
danielgrippi
aed08d6283 removed unused method; moved includes() out of scope 2011-09-14 00:10:04 -07:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
Maxwell Salzberg
119cb37ba5 DG MS; broke validations into methods in receiver 2011-09-13 16:42:47 -07:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00
Maxwell Salzberg
adaefd0cb5 MS DG rspec is green update gemfile 2011-09-13 13:34:49 -07:00
Maxwell Salzberg
dd1b869705 wip 2011-09-13 13:14:43 -07:00
Maxwell Salzberg
5258a37ce5 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:11:43 -07:00
danielgrippi
2022187942 sprinkle a little documentation around lib, mostly just specifying return types 2011-09-12 23:01:47 -07:00
Maxwell Salzberg
ee257b2a7c MS DG forgot require for cucumber 2011-09-12 17:35:54 -07:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
0ab0526cd6 DG MS; put validates_associated in relayable, removed from receiver logic 2011-09-12 15:06:17 -07:00
Maxwell Salzberg
5177e5b218 DG MS test receive_relayable 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
87c994fa47 MS DG cleaned up and fleshed out salmon specs 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6dede984e9 delegate instead of denormalize 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
34ed07260f MS IZ DG moar salmon refactoring 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
e0429ee823 MS DG pulling apart salmon and making our custom hacks more obvious 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
Ilya Zhitomirskiy
6a6c4cd82b unsubscribers in csvs 2011-09-12 11:11:53 -07:00
danielgrippi
cb2c094139 use method not instance var 2011-09-11 20:08:00 -07:00
danielgrippi
1bd37038cc fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
21182c88ec initial tests for AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
ec4dc7a905 Created AspectStream; removed all logic from AspectsController#index 2011-09-11 14:16:48 -07:00
Maxwell Salzberg
0c00947fec temporary fix to prevent DiapsoraHQ from killing Diasporg till we implemnt fanout 2011-09-08 10:24:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
fd6981c3d2 changed the default location 2011-09-07 14:38:31 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
85c64504ac capitalization 2011-09-07 11:41:55 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
80b2f69061 Revert "capitalization" 
This reverts commit 9e0afb4a33.
 2011-09-07 11:37:52 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
4f70147381 Revert "removed the non-used label" 
This reverts commit 2bccea1b04.
 2011-09-07 11:37:35 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2bccea1b04 removed the non-used label 2011-09-07 11:33:35 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
9e0afb4a33 capitalization 2011-09-07 11:28:35 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
9d142cab8d not doing an if statement 2011-09-07 11:23:36 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7362e18fc9 no need to check for empty string 2011-09-07 11:09:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
08b17e07f4 added the check for invitation token 2011-09-07 10:52:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
20f5a02eed using the the correct timeformat for the query 2011-09-07 10:34:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8bb19288f5 made the links https and made sure we pull back users with emails 2011-09-07 10:15:22 -07:00
Jonne Hass
bc4872d3a5 ensure handle is downcased on search, fix #1912 2011-09-07 15:17:42 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3ae8f300ee changed the default location 2011-09-07 03:20:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b76133c56a separate tmp directory 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ef9eff300b not doing joins where they are not needed 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c03fec1244 the non-waitlist csv writing to tmp 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
91d60f5e01 wip 2011-09-07 02:50:43 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7485271573 wip csv gen 2011-09-07 02:50:43 -07:00
Maxwell Salzberg
0e7521df9f adding csv generator 2011-09-07 02:50:43 -07:00
Jonne Hass
292b1e7465 small cleanup 2011-09-06 20:13:56 +02:00
Sarah Mei
ad009a71dc Don't run oauth.feature on travis, but run all features locally. 2011-09-04 11:27:30 -07:00
Sarah Mei
8d95684341 move jasmine before cucumber so we can fail faster on travis 2011-09-03 20:30:26 -07:00
Sarah Mei
4f11b75ed1 RAKE jasmine:ci. Duh. 2011-09-03 18:14:26 -07:00
Sarah Mei
45ffd99c11 Put a bit more messaging so we can see where the rspec double run is coming from. 2011-09-03 16:54:56 -07:00
Sarah Mei
984061cb80 Run spec, cucumber, and jasmine separately in an effort to not run rspec twice. 2011-09-03 16:38:16 -07:00
Maxwell Salzberg
09d4918e80 SM MS improve relayable semantics 2011-09-03 16:36:15 -07:00
Maxwell Salzberg
26151263c5 put receiving in a transaction, to prevent the crazy duplicate index errors and hopefully fix federation visibility. 2011-09-03 16:04:53 -07:00
Sarah Mei
0a3f353f6a Run all specs on travis. Also, add 1.9.2 run. 2011-09-03 14:24:48 -07:00
Sarah Mei
14324aecc2 Install firefox on travis. Only run cucumber to save time while experimenting. 2011-09-03 14:10:06 -07:00
Sarah Mei
3fe6f47648 Add xvfb start to travis config. Use xvfb in specs. 2011-09-03 13:23:20 -07:00
Sarah Mei
9960b5b189 Gotta escape & before other stuff in markdownify - in 1.8 it was always first but not in 1.9 because the list of entities was a hash. This change converts to an array. 2011-09-03 11:26:11 -07:00
Maxwell Salzberg
48cdf7c79f fix poetry mode, due to a mistake I made previously. also fixed a 500 where youtube titles do the unexpected 2011-09-01 12:03:07 -07:00
Maxwell Salzberg
7d96b603d3 fix bug where if youtube_maps or vimeo_maps were passed in as explicitly nil, the app would 500. #somethingididnotknow (Hash#fetch is kind of weird 2011-09-01 10:14:53 -07:00
Maxwell Salzberg
62aea0e820 fix for mention links, and the first tag links #ohYEAH 2011-08-31 18:06:30 -07:00
Maxwell Salzberg
272ab55482 Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown 2011-08-30 22:15:52 -07:00
Sarah Mei
b6e2e9452f Fix YouTube titles on 1.9. (SIGH.) 2011-08-30 21:04:29 -07:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Maxwell Salzberg
83b99890ba another shot at fixing markdownify 2011-08-29 19:43:29 -07:00
Maxwell Salzberg
e30c84ee96 small fix for markdownify 2011-08-29 19:38:51 -07:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Raphael Sofaer
2c65593579 Add quick option to mysqldump 2011-08-18 10:33:27 -07:00
Raphael Sofaer
f3932132d3 Let the next backup job overwrite the sqldump 2011-08-18 08:34:34 -07:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Brian Wisti
a442e7c8ae oops. left a merge conflict in 2011-08-16 23:01:08 -07:00
Brian Wisti
8f78a2d977 merge 2011-08-16 22:12:07 -07:00
Brian Wisti
888ad0a31c merging for 1305 2011-08-16 22:05:52 -07:00
Brian Wisti
805a9eb921 resolve my own merge conflicts. 2011-08-16 21:59:13 -07:00
Brian Wisti
b87c7bb489 Improve code block support 2011-08-16 21:48:48 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Brian Wisti
0180aebced Merge branch 'master' of git://github.com/diaspora/diaspora into 1305-full-markdown 2011-08-16 12:39:33 -07:00
Brian Wisti
6e248c2d5c Improve code block support 2011-08-16 12:28:09 -07:00
Brian Wisti
2303686e31 basic support for Redcarpet Markdown 2011-08-16 10:28:00 -07:00
Raphael Sofaer
abd5760569 Write, don't append backup 2011-08-12 13:32:14 -07:00
Raphael Sofaer
8b743e7e3b Fix stack level too deep error on reshares 2011-08-12 13:20:25 -07:00
Maxwell Salzberg
ad5bd90b63 add number to inviter 2011-08-10 21:08:42 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
Raphael Sofaer
20523f99af Document a method 2011-08-10 17:31:18 -07:00
Raphael Sofaer
e0051eaba8 send hoptoad the whole backtrace, rather than just the application backtrace 2011-08-10 15:32:31 -07:00
Raphael Sofaer
46f940621d Remove another puts 2011-08-10 11:20:44 -07:00
Raphael Sofaer
1df654d416 Send a correct backtrace and some other nice things to airbrake on resque errors 2011-08-10 11:10:13 -07:00
Raphael Sofaer
a2bfc4a487 Limit the length of some log statements 2011-08-10 10:56:23 -07:00
Raphael Sofaer
333081f8b1 Fix resque job logging spec 2011-08-09 17:05:34 -07:00
Raphael Sofaer
2229921ba9 Put the production mode restriction back into hoptoad notifications from resque 2011-08-09 16:19:02 -07:00
Raphael Sofaer
87ffce4f64 Get hoptoad notifications working from resque 2011-08-09 16:04:23 -07:00
Raphael Sofaer
0da8445b2f Send errors in resque to hoptoad 2011-08-09 14:51:19 -07:00
Raphael Sofaer
015879a96a Move the unserialized_attribute override into the youtube_titles module. 2011-08-09 14:23:50 -07:00
Raphael Sofaer
840901c0a8 Allow logging with blocks so that hoptoad works. 2011-08-09 11:43:34 -07:00
Maxwell Salzberg
e845bcf8e7 fix batch inviter 2011-08-08 19:18:25 -07:00
Maxwell Salzberg
f1a64c46f4 fixing the inviter 2011-08-08 19:07:38 -07:00
Raphael Sofaer
3f9954d18b Enable single-transaction mode in the backup script... that was a pretty dumb oversight. 2011-08-08 15:49:17 -07:00
Raphael Sofaer
3631178579 Add times to output of backup script, so we can correlate it with db slowdowns. 2011-08-08 14:58:10 -07:00
Raphael Sofaer
62d52f7db5 Nice tar in the mysql backup script as well 2011-08-08 14:48:35 -07:00
Raphael Sofaer
d517ce90fa Nice mysqldump in the backup script. 2011-08-08 14:47:22 -07:00
Raphael Sofaer
1a72be544f Instantiate one fewer string in the rtl code 2011-08-06 12:58:27 -07:00
Raphael Sofaer
5768d3188a Don't instantiate objects where constants can be used. 2011-08-06 12:58:27 -07:00
Raphael Sofaer
66c7f283e0 Remove unused method in querying.rb. 2011-08-05 18:39:18 -07:00
Raphael Sofaer
e366a4b8b5 re-enable the embedder feature outside of CI 2011-08-05 17:03:21 -07:00
Raphael Sofaer
78a8dc82f4 Add a timestamp to splunk-style logs 2011-08-05 12:18:19 -07:00
Raphael Sofaer
61eea529cb Don't update target.updated_at when updating target.likes_count 2011-08-03 18:36:34 -07:00
Raphael Sofaer
5967f01dab Take out PostsFake, now that we ajax in comments it's not worth the extra complications 2011-08-03 11:09:21 -07:00
Raphael Sofaer
ce959b62a9 Delete the sql logging, the backtrace cleaner was out of control 2011-08-02 16:27:37 -07:00
Raphael Sofaer
f9f583058a Remove old seed scripts 2011-08-01 16:15:56 -07:00
Raphael Sofaer
2a0df9841a Correct batch emailer fixture 2011-08-01 16:00:01 -07:00
Raphael Sofaer
3d88095ba2 Updating batch inviter 2011-08-01 14:49:21 -07:00
Raphael Sofaer
983d4e5598 Hopefully make youtube_titles a little less ridiculous 2011-08-01 12:30:21 -07:00
Sarah Mei
b7b1c6b276 Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n. 2011-07-30 22:41:46 -07:00
Maxwell Salzberg
5e5671ecf8 fix post vis batch update 2011-07-29 19:36:29 -07:00
Maxwell Salzberg
73616a3e7a new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about) 2011-07-29 17:20:10 -07:00
Raphael Sofaer
f9bf34a73e Fix defaults for activerecord models in i18n 2011-07-29 15:51:38 -07:00
Raphael Sofaer
bea333842f Make sure that a MissingInterpolationArgument in the english locale is raised 2011-07-29 14:30:20 -07:00
Raphael Sofaer
b56838e5b1 Fall back to english on MissingInterpolationError 2011-07-29 14:30:20 -07:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Raphael Sofaer
70be713b15 Drop the integration databases in rebuild 2011-07-21 18:23:33 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
Raphael Sofaer
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
fb492b2b62 Shorter backtrace in the SQL logs 2011-07-15 15:28:05 -07:00
danielgrippi
67882c775e Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable. 2011-07-11 15:06:35 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Raphael Sofaer
e1a7ff798a Seed in rebuild 2011-07-09 16:55:05 -07:00
Raphael Sofaer
c83276a9d9 OK, now I get what was going on. 2011-07-07 22:17:42 -07:00
Raphael Sofaer
d8e891b492 Revert "escape js in format_tags until I can think about whether we have an XSS problem in the morning" 
This reverts commit 8af95909c2.
 2011-07-07 22:13:02 -07:00
Raphael Sofaer
8af95909c2 escape js in format_tags until I can think about whether we have an XSS problem in the morning 2011-07-07 21:54:56 -07:00
Raphael Sofaer
d0ce257107 Revert "Revert "Merge branch 'hashtags-in-comments'"" 
This reverts commit d2e26f6937.
 2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937 Revert "Merge branch 'hashtags-in-comments'" 
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
 2011-07-07 13:39:15 -07:00
danielgrippi
310b9969f3 hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here... 2011-07-07 12:21:57 -07:00
Raphael Sofaer
1d5b08aa92 Don't use the pretty formatter on CI 2011-07-06 10:09:58 -07:00
Raphael Sofaer
27f78dd1ad Rake cucumber should be pretty 2011-07-05 18:15:17 -07:00
Raphael Sofaer
53993cd714 Use schema:load on CI 2011-07-05 12:07:03 -07:00
Raphael Sofaer
5f592f9616 Schema:load in ci breaks it, because we would need to drop and re-create as well 2011-07-05 08:52:48 -07:00
Raphael Sofaer
e916cd5c2f Why migrate on CI? Schema load. 2011-07-04 22:12:05 -07:00
Raphael Sofaer
e34809c8ed Use the rails backtrace cleaner 2011-07-04 15:00:42 -07:00
Maxwell Salzberg
f4f34e0faa fix for public posts in development mode, in single process mode, when your pod_url is still set to localhost 2011-07-04 12:20:15 -07:00
Raphael Sofaer
a36bd9897f Put the cruisecontrol stuff back in the cruise rake task, rather than a method. 2011-07-02 12:25:19 -07:00
Raphael Sofaer
7f55279962 I have no idea why travis ran the specs twice, but let's try again. 2011-07-02 10:21:30 -07:00
Raphael Sofaer
bc5d29bff3 Take some stuff out of the travis run, I think we need to use headless instead of an explicit xvfb. Turning off travis for now. 2011-07-02 10:21:30 -07:00
Raphael Sofaer
de8e750b0d Put it all in the travis yml file 2011-07-02 00:56:27 -07:00
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
Raphael Sofaer
d1a149f9f6 Some stuff to not need an application.yml in CI 2011-06-29 11:52:13 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer
7ba80ce799 change the build script that actually runs 2011-06-28 10:54:00 -07:00
Maxwell Salzberg
c2565127c7 regenerate application.yml on every build 2011-06-28 10:28:17 -07:00
Raphael Sofaer
ce2518ea82 Docs for log_overrider 2011-06-26 20:42:30 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
Jonne Hass
58ba4db3c8 Merge pull request #656 from cyberkov/1041-whitespace-tasks 
fixed whitespace task mentioned in bug 1041
 2011-06-22 04:17:04 -07:00
danielgrippi
74f9ffbbdf 8 failures left with sqlite3 adapter 2011-06-22 00:22:16 +02:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
ab398555d6 Back to green in mysql 2011-06-19 16:16:30 +02:00
Raphael Sofaer
7c454b7d15 Fix stream query for postgres, shouldn't break mysql 2011-06-19 16:16:30 +02:00
cyberkov
94b152e733 fixed whitespace task mentioned in bug 1041 2011-06-15 13:48:40 +02:00
Raphael Sofaer
480d7c47cf Documentation is so rad. 2011-06-13 17:02:18 -07:00
Raphael Sofaer
7171aa05ed Do a little bit more documenting. 2011-06-13 16:31:40 -07:00
Ilya Zhitomirskiy
71dd8dc7f3 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/app_config.rb
 2011-06-09 15:51:59 -07:00
Raphael Sofaer
c78e903794 Change rebuild back to using migrate 2011-06-09 15:30:58 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
danielgrippi
d7efee55a1 load schema instead of migrating on rake db:rebuild 2011-06-06 19:39:14 -07:00
danielgrippi
bd8ea324ae remove unused rake task 2011-06-06 19:37:51 -07:00
Raphael Sofaer
1aa1ddc829 Forgot the space in SplunkLogging 2011-06-04 23:44:12 -07:00
Raphael Sofaer
6d105e5c09 Don't n query in UsersController#public 2011-06-04 22:34:48 -07:00
Raphael Sofaer
5314e27e78 Clean up the SplunkLogging mixin to make searching in the splunk console a little easier 2011-06-04 18:37:20 -07:00
Raphael Sofaer
283e376712 Move initialize_signatures method out of user and into relayable 2011-06-01 16:45:30 -07:00
Raphael Sofaer
06217a0a1d Fix stream query 2011-06-01 14:19:27 -07:00
Raphael Sofaer
9aad7810c0 Move visible_posts defaults into a defaults hash, mostly 2011-06-01 12:24:07 -07:00
Raphael Sofaer
5455aedf1d Compress the database dump during backup 2011-06-01 10:56:12 -07:00
Raphael Sofaer
b3cbe0a3a5 Wrap integration rake in MissingSourceFile rescue to avoid failure when the test gems aren't present. 2011-06-01 10:25:19 -07:00
Raphael Sofaer
71c3a29aa6 Move YoutubeTitles callback into module 2011-05-31 12:27:57 -07:00
Sarah Mei
8de71d41e4 Don't need to export the selenium server port anymore on CI. Yay! 2011-05-28 22:22:06 -07:00
Sarah Mei
f732d20f0c Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt. 2011-05-28 21:03:39 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
Raphael Sofaer
38289b1a47 Multi-server integration tests are now possible 2011-05-25 15:16:14 -07:00
MrZYX
0c5bdece5a warn and exit if there's no config at all 2011-05-25 23:39:54 +02:00
Sarah Mei
c6d61c68c0 Backfill some tests for app config, refactor base file name so people copy it instead of moving it 2011-05-25 11:07:29 -07:00
MrZYX
574deada03 get rid of nil values in app config, they destroy the merge 2011-05-24 23:54:31 +02:00
Raphael Sofaer
609439f948 Destroy notifications on contact destroy 2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781 Gross, but hopefully temporary solution for namespaced classes and old versions of libxml 2011-05-23 16:24:28 -07:00
Raphael Sofaer
6b094b2f35 Take out begin rescue in diaspora parser, that's handled in the resque job wrapper 2011-05-23 15:40:03 -07:00
Raphael Sofaer
93be5497a7 Small controller for generating an auth token, if you are an authable user 2011-05-19 18:29:53 -07:00
Raphael Sofaer
7912c8af3b Be nicer about changing app_config.yml to app.yml 2011-05-19 17:01:41 -07:00
danielgrippi
b0967ad8b4 Fakes respond as expected to respond_to? 2011-05-19 16:24:12 -07:00
MrZYX
443b66ba32 one more important app_config 2011-05-18 20:56:22 +02:00
MrZYX
60870cab37 one more app_config 2011-05-18 20:53:45 +02:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
MrZYX
1a78c8fca1 whoops lets do a deep merge 2011-05-18 19:22:15 +02:00
MrZYX
e79a6597e6 eliminate config/server.sh; use config/app_config.yml.example as base for configuration, config/app_config.yml is now just an overider. This way we can add new configuration options without checking in the application if it's set and the user has to update his app_config.yml only when he want to change something 2011-05-18 16:11:20 +02:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
MrZYX
00c6631f11 replaced SOCKET_PORT in config/server.sh with the setting from config/app_config.yml; respect single_process_mode setting in app_config.yml in script/server 2011-05-17 16:00:47 +02:00
danielgrippi
55d39521c4 rescue redis connection attempts in websocket 2011-05-16 18:34:37 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
Sarah Mei
3b3ae86125 Get rid of annoying app_config.yml warning in test and development 2011-05-14 12:52:53 -07:00
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
MrZYX
3e3b8e07b2 add space before adding pid to logline 2011-05-08 21:36:27 +02:00
Arzumy MD
fad9635022 Added spec for YOUTUBE_ID_REGEX, we can easily add more youtube url sample here later to avoid polluting application_helper spec 2011-05-06 00:47:40 +08:00
danielgrippi
0db8541f6e added a pane for people sharing with you on all aspect page 2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32 split 'mutual' flag into 'sharing' and 'receiving' on Contact 2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10 #1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor 2011-05-05 00:05:59 +08:00
Arzumy MD
cdf94a0275 #1019 comment/post handles multiple youtube links properly 2011-05-05 00:05:59 +08:00
Sarah Mei
84ca9dfed6 Fix splunk logging in 1.9 2011-04-29 20:57:25 -07:00
MrZYX
009bbb826b added \b (word ending) to tag regex to exclude :;?! etc.; allow : in tags 2011-04-30 00:08:33 +02:00
Raphael Sofaer
4ed621fc1f reenable logging 2011-04-28 09:38:28 -07:00
Raphael Sofaer
948725b946 Fix infinite scroll after changing aspects 2011-04-26 18:26:12 -07:00
Raphael Sofaer
ba3b4f7d60 Add PID to log lines 2011-04-25 11:54:25 -07:00
Maxwell Salzberg
e866fdb1f3 small fix to make atom valid 2011-04-22 11:01:38 -07:00
MrZYX
9df8f83276 fixed specs for me and serveral others (thanks @jrichardlai); fixed cucumber 2011-04-17 21:28:09 +02:00
Raphael Sofaer
efe79eb351 Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
Raphael Sofaer
9383388bb6 Dumb fix for pagination 2011-04-13 10:46:31 -07:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
danielgrippi
352d1c6abf fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
MrZYX
54aa2c7ce3 whoops, let's not break inital fetching 2011-04-09 20:21:27 +02:00
MrZYX
e7eb9adbf5 do not webfinger if we have no clue about the handle 2011-04-09 18:40:40 +02:00
MrZYX
fbe91aba3a refetch profile if it's missing, comment out hydra stub for now because it breaks the specs 2011-04-09 15:20:28 +02:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
Raphael Sofaer
8af6fab0a4 Move rspec rake stuff into loaderror begin-rescue so that we can deploy with --without test 2011-04-06 14:44:04 -07:00
Raphael Sofaer
847a66735a Increase time between thin restarts, rescue jasmine load failure for deploying without test gems 2011-04-06 14:32:46 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Raphael Sofaer
3fb822c6c5 Fix distinct problem 2011-04-06 12:29:05 -07:00
Raphael Sofaer
bbf1bf00cb Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would. 2011-04-06 12:11:49 -07:00
danielgrippi
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
Raphael Sofaer
fa41c1fc52 Stream query... FIXED????? 2011-04-05 14:56:56 -07:00
Raphael Sofaer
746a0c38b3 Take another shot at fixing pagination 2011-04-05 13:59:15 -07:00
Raphael Sofaer
fddd252aee Take out limit hack, pass offset through instead 2011-04-05 11:50:09 -07:00
Raphael Sofaer
03e37d2186 Using union in stream query 2011-04-05 11:40:32 -07:00
Raphael Sofaer
fdb6675f28 Make things more postgres compatible 2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
Raphael Sofaer
b48b483eab Still working on stream query 2011-04-04 13:06:15 -07:00
Raphael Sofaer
d09bf35213 Add tests for raw_visible_posts 2011-04-04 12:07:19 -07:00
MrZYX
42523139c7 fixed for ruby 1.9 2011-04-03 22:11:52 +02:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a1c3a6dc1e lets see if that fixes the build 2011-04-02 15:53:58 +02:00
Raphael Sofaer
24fffc0220 Simplify query, now we just have to fix it 2011-03-30 19:17:52 -07:00
Raphael Sofaer
435b16b30a Don't index on just hidden 2011-03-30 19:17:52 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
Raphael Sofaer
e3ad078ba5 Scope querying in PhotosController#show 2011-03-30 16:40:01 -07:00
Raphael Sofaer
8c9a7e1c41 Fix PhotosController#show 2011-03-30 15:43:44 -07:00
maxwell
6364f2a332 clean activity streams, fix test 2011-03-30 14:27:20 -07:00
MrZYX
cd3a307785 disallow % in tags 2011-03-30 20:02:10 +02:00
MrZYX
66ea747571 disallow dots in tags as rails routing system doesn't like them 2011-03-30 15:41:26 +02:00
danielgrippi
0c8db5beee Fix find_visible_post_by_id 2011-03-29 20:17:19 -07:00
danielgrippi
2487db3257 reduce the number of ruby objects instantiated in posts_from 2011-03-29 20:03:16 -07:00
danielgrippi
5b0da52e0a fixed comment socketing bug, post ordering on own profile page. 2011-03-29 19:40:44 -07:00
danielgrippi
93b82a377f fix temp pagination fix in raw_visible_posts. 2011-03-29 19:20:31 -07:00
danielgrippi
5bd47f20c1 Only get non-pending posts in posts_from 2011-03-29 19:00:51 -07:00
danielgrippi
b3cb8e0a2b temp fix for pagination. photos index fix 2011-03-29 18:55:00 -07:00
danielgrippi
aa4c20e404 pass post to comments partial. use sql in raw_visible_posts 2011-03-29 17:31:57 -07:00
danielgrippi
99e55c82eb disambiguate ordering 2011-03-29 17:31:56 -07:00
danielgrippi
371aa71ca8 add ordering to raw_visible_posts 2011-03-29 17:31:56 -07:00
danielgrippi
6df652a513 Limit posts in raw_visible_posts 2011-03-29 17:31:56 -07:00
danielgrippi
97d8b34599 Fix all specs, add foreign key constraints on post_visibility 2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91 8 failures left. wip. 2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
zhitomirskiyi
18ea46710b not delivering to local for profiles 2011-03-29 17:23:28 -07:00
MrZYX
421e50d2ca specify what we don't want in a tag for now 2011-03-26 19:02:04 +01:00
Raphael Sofaer
6855447204 unicode fix in tags 2011-03-25 17:39:44 -07:00
Raphael Sofaer
fef226156c Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable? 2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628 Relayable retractions pretty much done 2011-03-25 16:09:37 -07:00
Raphael Sofaer
cc84ddbe94 Move encryptable out of relayable for use in relayable_retraction 2011-03-25 16:09:37 -07:00
danielgrippi
f36e884d67 added logo to atom feed 2011-03-25 10:16:00 -07:00
Raphael Sofaer
85e0736e5b Remove stray puts 2011-03-21 17:12:54 -07:00
zhitomirskiyi
70d71ec491 service users is green 2011-03-21 14:56:50 -07:00
MrZYX
88e642ffdb disallow _ in tags because they interfer with markdownify 2011-03-21 22:31:01 +01:00
Sarah Mei
10019bb3db Fix User spec. Also, people_in_aspects now won't let you get people for aspects you don't own. people_in_aspects should probably be arel and/or an association extension. 2011-03-19 13:25:27 -07:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
Raphael Sofaer
bef06d18d8 Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
Raphael Sofaer
5a1d8d091a Fix condition for queuing job 2011-03-17 14:12:52 -07:00