Commit graph

1010 commits

Author SHA1 Message Date
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