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 |
|
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 |
|
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
|
1ec1ada70b
|
Take out giant log line
|
2010-11-27 21:33:12 -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 |
|
Jamie Wilkinson
|
0906f38f6d
|
Use HAML ugly mode in production
|
2010-11-27 14:32:57 -08: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 |
|
Alexandre DE DOMMELIN
|
67d517c24b
|
Fixing Issue #367: Start script could expose sensitive information
|
2010-11-27 23:23:11 +01:00 |
|
Raphael
|
c46b6d80aa
|
Correct math, take out link_tos
|
2010-11-27 17:07:35 -05:00 |
|
Raphael
|
49f4ec1432
|
comment ids in the logs
|
2010-11-27 16:21:40 -05:00 |
|
danielvincent
|
64f7a20ff4
|
fixed specs, took out that nasty raise.
|
2010-11-27 16:20:46 -05:00 |
|
maxwell
|
c65c62906c
|
pushing so dan can look at how to stub EM:next_tick correctly
|
2010-11-27 16:20:46 -05:00 |
|
maxwell
|
62b4e85b0b
|
DG MS move dispatch post to EM::next_tick in controller so the post response returns to the poster much faster. also fixed a bug in the logs refrencing an object that did not exsist
|
2010-11-27 16:20:46 -05:00 |
|
Raphael
|
be463f8f7f
|
Logging for comment partial rendering
|
2010-11-27 16:17:12 -05:00 |
|
Raphael
|
7030ed0fed
|
Putting youtube titles back into status messages
|
2010-11-27 11:43:24 -05:00 |
|
Hexagon
|
702abddce3
|
1900 was too far back for rails, 1904 were accepted.
|
2010-11-27 14:13:29 +01:00 |
|
Hexagon
|
033eea9f50
|
Fixed #550, diaspora now support seniors up to 110
|
2010-11-27 14:02:42 +01:00 |
|