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

1504 commits

Author SHA1 Message Date
Raphael Sofaer
c83276a9d9 OK, now I get what was going on. 2011-07-07 22:17:42 -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
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -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
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 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
Raphael Sofaer
efd6275e68 Don't instantiate objects in tag_string 2011-07-05 17:56:38 -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
00589c10c6 If one user has a bad rsa key, don't abort all sends. 2011-07-04 18:00:55 -07:00
Maxwell Salzberg
408690f0fa remove stray puts 2011-07-04 13:57:23 -07:00
Maxwell Salzberg
2f1118f95f refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect 2011-07-04 13:54:05 -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
6f72a0cb38 order facebook friends 2011-07-02 19:01:58 -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
danielgrippi
3a5f0c9678 proper uniqueness validation in auth model 2011-06-29 17:32:55 -07:00
danielgrippi
38ddb4b744 correctly scoping the uniqueness validation dg iz 2011-06-29 17:24:05 -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
1ced4c502d Put as_json back in person 2011-06-29 08:48:34 -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
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
Raphael Sofaer
e468075ffd Doc AS::Photo 2011-06-26 20:59:02 -07:00
Raphael Sofaer
2857de5f1b doc a user method 2011-06-24 10:38:06 -07:00
Raphael Sofaer
18138e1507 Doc 2011-06-24 10:38:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213 Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env. 2011-06-23 14:20:53 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
a987b198fd Fix search in PG 2011-06-22 15:09:00 -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
Ilya Zhitomirskiy
c09fb776fb added a couple of validations on the Oauth models, added an index on a user's authorizations 2011-06-20 18:30:18 -07:00
danielgrippi
890dc7efd5 put some dependent destroys on models for better sqlite compatability 2011-06-19 23:39:57 +02:00
Raphael Sofaer
f0cb2159c7 Make contacts appear at the beginning of search results in postgreSQL 2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
75a1012c1c moved the monkey patching to a model, need to do a couple of validations 2011-06-15 18:30:05 -07:00
Raphael Sofaer
800e701f89 Document User#accept_invitation 2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1 Take loop out of remove_mentions 2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2 Document liked? and like_for 2011-06-14 10:15:32 -07:00
danielgrippi
b446404348 Revert "Without loaded? I was confused by the liked? and like_for methods." 
This reverts commit 2103d54fe4.
 2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4 Without loaded? I was confused by the liked? and like_for methods. 2011-06-13 17:14:00 -07: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