danielgrippi
|
e6d4ec2dc8
|
added as::photo view
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
34e3403e2e
|
jasmine green again; template switching in place, defaulting to displaying post text
|
2012-01-07 14:23:21 -08:00 |
|
Dennis Collinson
|
8e3db3aebe
|
make jasmine view tests work, load templates, party
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
4883c70ae2
|
move templates into app/views/templates/_templates.haml
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
52e3f1b240
|
DC DG; test stream view WIP
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
1d178116e9
|
DC DG; jasmine green
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
f62b26fc73
|
put the frontend into its own folder; only use one routes file
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
1ecfa92c9e
|
DH DG; create comments via backbone
|
2012-01-07 14:23:21 -08:00 |
|
danielgrippi
|
3f7d992a0b
|
DH DG; added new routes for streams; fixed pagination
|
2012-01-07 14:23:21 -08:00 |
|
Dan Hansen
|
80f797a581
|
introduce comments
|
2012-01-07 14:23:21 -08:00 |
|
Dan Hansen
|
ba9ece0014
|
Use routers, remove some hacks
|
2012-01-07 14:23:21 -08:00 |
|
Daniel Grippi
|
d4219799e4
|
namespace view, model, and collection under App
|
2012-01-07 14:23:20 -08:00 |
|
Daniel Grippi
|
dca3581ae2
|
added likes to the stream element underscore partial
|
2012-01-07 14:23:20 -08:00 |
|
Daniel Grippi
|
d504bf4591
|
add current user to body tag data field (hackity hack). add comment links to posts
|
2012-01-07 14:23:20 -08:00 |
|
Daniel Grippi
|
176963fdad
|
serialize current user json into body tag for now
|
2012-01-07 14:23:20 -08:00 |
|
Daniel Grippi
|
19db5519c0
|
DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now).
|
2012-01-07 14:23:20 -08:00 |
|
danielgrippi
|
aa7343d759
|
add profile streams to backbone. this breaks hovercards, atm.
|
2012-01-07 14:23:20 -08:00 |
|
danielgrippi
|
42ce3b277b
|
backbone all the streams, besides user. don't use the acts_as_api way for now.
|
2012-01-07 14:23:20 -08:00 |
|
danielgrippi
|
91ba6447d0
|
add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip
|
2012-01-07 14:23:20 -08:00 |
|
danielgrippi
|
2a13381773
|
DG DH; pagination on backbone stream
|
2012-01-07 14:23:20 -08:00 |
|
danielgrippi
|
c360e82f11
|
DG DH; backbone stream now sort-of renders on multis_controller; wip
|
2012-01-07 14:23:20 -08:00 |
|
Maxwell Salzberg
|
a1b389c365
|
SM MS; stub jquery in cukes, cleanup env.rb
|
2012-01-07 13:07:45 -08:00 |
|
Maxwell Salzberg
|
91c21f5d92
|
MS SM; removed seemingly unused(?) layout file
|
2012-01-07 12:56:32 -08:00 |
|
Maxwell Salzberg
|
2422bdab46
|
MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes
|
2012-01-07 12:55:46 -08:00 |
|
danielgrippi
|
f395a707ea
|
destroy cookies instead of visiting a controller action for signing out (thx sarahmei)
|
2012-01-06 23:28:23 -08:00 |
|
danielgrippi
|
2dd0012d1e
|
update some gems (selenium, rspec-core, heroku, cucumber, fog, fb, etc)
|
2012-01-06 22:33:55 -08:00 |
|
Jonne Haß
|
a1c30ac096
|
updated 35 locale files [ci skip]
|
2012-01-07 00:00:30 +01:00 |
|
danielgrippi
|
2e3b8f9d53
|
speed up cucumber
|
2012-01-05 22:41:05 -08:00 |
|
Maxwell Salzberg
|
0891fc683b
|
build the backbone stream branch on github
|
2012-01-05 20:02:57 -08:00 |
|
Maxwell Salzberg
|
68f25c8d4e
|
fix app_config spec as we broke out setup into its own method
|
2012-01-05 19:05:13 -08:00 |
|
Maxwell Salzberg
|
523a960d94
|
peace troll
|
2012-01-05 18:53:27 -08:00 |
|
Maxwell Salzberg
|
a7eb135ad0
|
peace bro
|
2012-01-05 18:31:00 -08:00 |
|
Jonne Haß
|
00a800ab07
|
this should fix a weired test polution case on travis where the x-git-revision header is suddenly nil
|
2012-01-06 03:26:00 +01:00 |
|
Maxwell Salzberg
|
41ecf2b27d
|
make a method in EnviromentConfiguration to test if newrelic is setup
|
2012-01-05 18:14:06 -08:00 |
|
Jonne Haß
|
5ee2a17d16
|
bundle without heroku on travis
|
2012-01-06 02:53:51 +01:00 |
|
Maxwell Salzberg
|
fa55200e9c
|
MS DC; as newrelic yml is always included, you need it in your bundle; also, make travis scripts noisy if they fail
|
2012-01-05 17:50:11 -08:00 |
|
Maxwell Salzberg
|
646981aa17
|
Merge branch 'heroku_fixes'
|
2012-01-05 17:31:49 -08:00 |
|
Maxwell Salzberg
|
cc6596262c
|
default newrelic to use ssl
|
2012-01-05 17:31:38 -08:00 |
|
Maxwell Salzberg
|
db387b5ed4
|
MS DC; remove backup.rake as we now use backup'
|
2012-01-05 17:31:38 -08:00 |
|
Maxwell Salzberg
|
cedc49bf09
|
MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml
|
2012-01-05 17:31:38 -08:00 |
|
Jonne Haß
|
683a74d859
|
Merge pull request #2588 from ChaseReid/patch-3
instead of redirecting to regular joindiaspora u just go 2 the site
|
2012-01-05 14:50:44 -08:00 |
|
Chase Reid
|
2f948eec4f
|
instead of redirecting to regular joindiaspora u just go 2 the site
|
2012-01-05 17:35:10 -05:00 |
|
Jonne Haß
|
c0e4fa831a
|
fix syntax error in production.rb
|
2012-01-05 20:17:30 +01:00 |
|
Maxwell Salzberg
|
0199949f3c
|
move analytics to initializer, thx MrZYX
|
2012-01-05 10:55:29 -08:00 |
|
Maxwell Salzberg
|
5a0f948a85
|
better file requires in production.rb
|
2012-01-05 00:02:59 -08:00 |
|
Maxwell Salzberg
|
d9c2b0d4b5
|
make cdn jquery http/s agnostic
|
2012-01-04 23:57:28 -08:00 |
|
Maxwell Salzberg
|
fdea2f94ff
|
remove icky analytics code from layouts, move to middleware
|
2012-01-04 23:54:48 -08:00 |
|
Maxwell Salzberg
|
9cdfea02b0
|
add the GC profiling option for newrelic for 1.9.2; see: http://newrelic.com/docs/ruby/ruby-gc-instrumentation
|
2012-01-04 22:28:18 -08:00 |
|
Maxwell Salzberg
|
7cc6e3ed68
|
uncomment cdn line.. whoops
|
2012-01-04 22:19:37 -08:00 |
|
Maxwell Salzberg
|
2f6d41ce47
|
use mongrel webserver for now in procfile for los
|
2012-01-04 22:09:09 -08:00 |
|