Raphael
|
fce428826c
|
Try to take photos query out of views
|
2010-11-29 23:41:03 -08:00 |
|
Raphael
|
fcb0e07dd7
|
Stop regenerating fixtures on every spec run
|
2010-11-29 23:22:49 -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
|
0f6b322333
|
Merge https://github.com/OhaiBBQ/diaspora into OhaiBBQ-06464cb
|
2010-11-29 17:17:01 -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
|
7d2b46c7c0
|
public helper spec superfluous, fixing build
|
2010-11-30 00:17:01 +01:00 |
|
maxwell
|
808b4af5c7
|
adding warning to startup about making sure mongo is bound to localhost
|
2010-11-29 14:50:38 -08:00 |
|
Hexagon
|
b0ff8f0f60
|
Mini refactor, removed terse_url function
|
2010-11-29 23:23:51 +01:00 |
|
Raphael
|
e86a5563ed
|
Override request started log line
|
2010-11-29 14:03:29 -08:00 |
|
Hexagon
|
d69bca28ef
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-29 22:56:01 +01:00 |
|
Hexagon
|
7bb32de899
|
Fixed #638, forcing trailing slash on pod url
|
2010-11-29 22:55:43 +01:00 |
|
maxwell
|
bf79d62317
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-29 13:41:38 -08:00 |
|
maxwell
|
4ef7c4d6d1
|
make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored.
|
2010-11-29 13:39:48 -08:00 |
|
Raphael
|
eccc25e20a
|
Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier
|
2010-11-29 13:14:27 -08:00 |
|
MrZYX
|
d8bc610adb
|
Merge branch '99translations' of ../diaspora-fork
|
2010-11-29 22:09:36 +01:00 |
|
MrZYX
|
8ffa5df927
|
Merge branch 'master' of https://github.com/masterdot/diaspora into masterdot-master
|
2010-11-29 22:01:13 +01:00 |
|
MrZYX
|
f94e079006
|
updated locales - finish is at 100% - thanks to all contributors
|
2010-11-29 21:53:52 +01:00 |
|
root
|
1b369a0e49
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-11-29 23:29:27 +03:00 |
|
root
|
06464cbfe8
|
Youtube videos now show themselves after the rest of the messages
|
2010-11-29 23:25:34 +03: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 |
|
Sarah Mei
|
5ae8a06016
|
unpendingify comment specs
|
2010-11-28 17:16:22 -08:00 |
|
Sarah Mei
|
5c76062932
|
remove warning when running specs
|
2010-11-28 17:15:50 -08: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 |
|
Hexagon
|
e05c113e27
|
Merge branch 'master' of https://github.com/jamiew/diaspora
|
2010-11-28 20:33:40 +01:00 |
|
Hexagon
|
16df6f8757
|
Merge branch '367-start-script-could-expose-sensitive-information' of https://github.com/adedommelin/diaspora
|
2010-11-28 20:25:27 +01:00 |
|
Hexagon
|
f8125cdc04
|
Path fíx in config.ru, for 1.9.2
|
2010-11-28 20:18:19 +01:00 |
|
Raphael
|
812aaae63f
|
Simplify stream_element partial
|
2010-11-28 11:31:31 -05:00 |
|
MrZYX
|
673fd38a2c
|
updated locales - big thank you to all people at 99translations
|
2010-11-28 15:33:17 +01: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 |
|
Raphael
|
4e15745170
|
Add spec to comment
|
2010-11-28 00:55:20 -05:00 |
|
Raphael
|
cbe98a1479
|
Add spec to commentscontroller
|
2010-11-28 00:39:23 -05:00 |
|
danielvincent
|
017075e480
|
actually include the javascript in the view...
|
2010-11-28 00:36:46 -05:00 |
|
Raphael
|
703e8e0426
|
Add spec for js requests on stmc create
|
2010-11-28 00:36:05 -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
|
8f67f90307
|
wtf weird chars in the JS
|
2010-11-27 22:32:20 -05:00 |
|