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

2039 commits

Author SHA1 Message Date
Raphael Sofaer
968100860a Don't show commented tags in the tag stream for now, until we optimize that 2011-07-07 15:39:28 -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
9d506231b1 querying correctly in tagscontroller to include posts with comments containing hashtag 2011-07-07 12:27:48 -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
1f448e8555 as_json wants a string 2011-07-07 10:56:55 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
Raphael Sofaer
a1ee8eb83b stub tests for not n-querying in the publisher 2011-07-07 09:06:24 -07:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys 
1137 bad rsa keys
 2011-07-06 10:00:44 -07:00
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
027f096ca7 turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
Ryan Hughes
2f89f19f34 Test sending to people with bad rsa keys. 2011-07-04 18:00:55 -07:00
danielgrippi
9debec4410 fix the build. 2011-07-04 16:53:43 -07:00
Raphael Sofaer
af6547815e Some view helper cleanup 2011-07-04 07:36:01 -07:00
Michael Sofaer
d2b7168195 Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
Sarah Mei
58ac33607a Fix build - stub request in notifications#index specs 2011-07-03 20:48:42 -07:00
danielgrippi
511a651377 don't query for mentioned people if mention syntax isn't present in message text. 2011-07-03 20:36:46 -07:00
danielgrippi
829c86823d remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them 2011-07-03 20:08:11 -07:00
Maxwell Salzberg
a104f4e309 if a user is logged in, redirect them to the proper authenticated view, not the public route 2011-07-03 09:13:39 -07:00
Raphael Sofaer
f161377480 Stop loading contact objects on the main page, all we need is people 2011-07-02 16:28:52 -07:00
Raphael Sofaer
290fb1e7f5 Cut 45 seconds out of the comments feature by using factories 2011-07-02 13:40:30 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
Sarah Mei
1bbfa97e5f DH SM MS pending photo spec for Dan 2011-06-30 21:04:18 -07:00
Robin Wellner
91dd4f847a Adds support for converting <-> to ↔ in markdownify 2011-06-30 14:27:39 +02:00
danielgrippi
55efe132c5 corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577 only allow https and www.cubbi.es in authorizations controller for now 2011-06-29 16:40:43 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
daf52eb21f Put the source back in the second Gemfile... 2011-06-29 15:03:23 -07:00
Raphael Sofaer
7ee3fcd811 Fix app_config spec 2011-06-29 14:08:25 -07:00
Raphael Sofaer
02489bb7cf This should fix CI for real 2011-06-29 12:07:10 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Dan Hansen
eaf7fcd7fe speed up notifications controller index spec 2011-06-28 23:31:34 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
0eb31e3ba7 added jwt to the chubbies bundle, made the asterisk black 2011-06-28 17:52:38 -07:00
Raphael Sofaer
4683047ee0 point diaspora client to the right place in the gemfiles 2011-06-28 17:36:01 -07:00
Raphael Sofaer
3078220bc0 Point diaspora-client to git 2011-06-28 17:25:02 -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