Raphael
|
d733d2c3bf
|
Take out print statements
|
2010-11-30 15:51:37 -08:00 |
|
Raphael
|
bfcae7fd80
|
Always set translations
|
2010-11-30 15:44:27 -08:00 |
|
Raphael
|
366734ca5e
|
Take queries out of aspect contacts pane on home page
|
2010-11-30 15:35:32 -08:00 |
|
Raphael
|
57485e7093
|
Move aspect contacts pane js to public
|
2010-11-30 13:55:37 -08:00 |
|
maxwell
|
ec05c21472
|
profile now knows about three images sizes, even in federation case
|
2010-11-30 13:40:41 -08:00 |
|
Raphael
|
a683512e6e
|
Take queries out of reshare
|
2010-11-30 13:31:48 -08:00 |
|
danielvincent
|
fa66162de5
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/helpers/application_helper.rb
app/views/comments/_comment.html.haml
app/views/people/_person.html.haml
app/views/shared/_stream_element.html.haml
|
2010-11-30 13:19:17 -08:00 |
|
Raphael
|
f44b02e22c
|
Clean up people/person
|
2010-11-30 13:07:02 -08:00 |
|
Raphael
|
93bbfd19d2
|
Move back to image link helper, but static
|
2010-11-30 13:07:02 -08:00 |
|
danielvincent
|
828635def9
|
Person#real_name -> Person#name
|
2010-11-30 13:01:53 -08:00 |
|
Maxwell Salzberg
|
7bce44ef28
|
remove brandon from author_info
|
2010-11-30 12:30:36 -08:00 |
|
Raphael
|
b5ed2ec5b0
|
Actually use the photos set in the controller
|
2010-11-30 12:25:56 -08:00 |
|
Raphael
|
49e8347aa3
|
Use static helper for aspect links
|
2010-11-30 12:23:43 -08:00 |
|
Raphael
|
b84d2bcc56
|
Don't use owns? in streamelement
|
2010-11-30 11:58:41 -08:00 |
|
Raphael
|
b0522535ac
|
Take queries out of reshare
|
2010-11-30 11:43:27 -08:00 |
|
Raphael
|
fce428826c
|
Try to take photos query out of views
|
2010-11-29 23:41:03 -08:00 |
|
maxwell
|
2d3f2df1fd
|
dont use object_path
|
2010-11-29 19:57:20 -08:00 |
|
Raphael
|
03e3c3a202
|
Render comment partial with collection option
|
2010-11-29 17:50:30 -08:00 |
|
maxwell
|
17a890676e
|
added a link in footer to this instances code. obey the agpl yo.
|
2010-11-29 16:46:43 -08:00 |
|
maxwell
|
96776f93f9
|
we need this for socketing... sorry
|
2010-11-29 16:19:36 -08:00 |
|
maxwell
|
e7fb70cdd1
|
we need this for socketing... sorry
|
2010-11-29 16:00:25 -08:00 |
|
maxwell
|
9707c5a124
|
remove single comment partial for speed in rendering
|
2010-11-29 15:47:24 -08:00 |
|
Hexagon
|
b0ff8f0f60
|
Mini refactor, removed terse_url function
|
2010-11-29 23:23:51 +01:00 |
|
MrZYX
|
8ffa5df927
|
Merge branch 'master' of https://github.com/masterdot/diaspora into masterdot-master
|
2010-11-29 22:01:13 +01:00 |
|
Raphael
|
760fed7016
|
No need for defined?
|
2010-11-29 12:10:41 -08:00 |
|
maxwell
|
e0efaa6317
|
made the checking for already connected more explicit. also, the check itself had a bug when we were calling self.to_id on a request, rather than self.to.id
|
2010-11-29 10:57:54 -08:00 |
|
masterdot
|
09d82fd08d
|
fix for intendation
|
2010-11-29 12:46:13 +01:00 |
|
masterdot
|
35feccbb2c
|
added support for tracking via piwik.
if piwik_id is not set no javascript will be included. it may be both enabled, aganalytics and piwik.
|
2010-11-29 10:26:47 +01:00 |
|
danielvincent
|
2c22941e2f
|
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
|
2010-11-28 20:16:57 -05:00 |
|
Raphael
|
ec6f42eaf0
|
Take JS out of landing page
|
2010-11-28 16:47:41 -08:00 |
|
danielvincent
|
c35be73978
|
added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive)
|
2010-11-28 18:51:27 -05:00 |
|
danielvincent
|
05174436c0
|
comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).
|
2010-11-28 18:51:27 -05:00 |
|
Raphael
|
812aaae63f
|
Simplify stream_element partial
|
2010-11-28 11:31:31 -05:00 |
|
danielvincent
|
d7c5e12d64
|
move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.
|
2010-11-28 02:30:25 -05:00 |
|
Raphael
|
845e1fe7a3
|
Fix comments ajax response
|
2010-11-28 01:31:05 -05:00 |
|
danielvincent
|
017075e480
|
actually include the javascript in the view...
|
2010-11-28 00:36:46 -05:00 |
|
danielvincent
|
3ada121d0b
|
contact-js as its own file
|
2010-11-28 00:29:22 -05:00 |
|
Raphael
|
5041a84882
|
Fix immediate response on status_message create
|
2010-11-28 00:23:53 -05:00 |
|
Raphael
|
5b29cff56a
|
Take out comment rendering logging
|
2010-11-27 23:46:13 -05:00 |
|
Raphael
|
6d6b07fb92
|
Use form_tag, not form_for, in _new_comment
|
2010-11-27 23:24:29 -05:00 |
|
danielvincent
|
f59c6e2427
|
refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now.
|
2010-11-27 23:06:34 -05:00 |
|
Raphael
|
68c0682ed0
|
Take a query out
|
2010-11-27 22:21:15 -05:00 |
|
Raphael
|
d2bfffca92
|
Fix PeopleController, add specs
|
2010-11-27 21:46:07 -05:00 |
|
Raphael
|
7ca124c002
|
Refactor views to not be so dumb.
|
2010-11-27 21:27:27 -05:00 |
|
Raphael
|
7b3aac923a
|
Take image_tag out
|
2010-11-27 18:05:47 -05:00 |
|
Raphael
|
e8310f2a19
|
Take benchmarks out of real_name, memoize it
|
2010-11-27 18:04:31 -05:00 |
|
Raphael
|
cedf4302a7
|
real_name takes time
|
2010-11-27 17:43:07 -05:00 |
|
Raphael
|
8e2c74bdd2
|
Take out link_to for real
|
2010-11-27 17:28:18 -05:00 |
|
danielvincent
|
d65ba2f291
|
removing contact pictures from contact list re aspects#show
|
2010-11-27 17:25:40 -05:00 |
|
Raphael
|
c46b6d80aa
|
Correct math, take out link_tos
|
2010-11-27 17:07:35 -05:00 |
|