maxwell
20ca2e2e93
make Notification.for return a query, not evaluate.. also limit notifications pulled back to 25
2010-12-16 11:16:09 -08:00
maxwell
6101f57d62
fix a couple of broken links in our readme, thx dmorley
2010-12-16 11:04:17 -08:00
maxwell
58ce05cf0e
fix a config option in chef script
2010-12-16 10:49:24 -08:00
maxwell
1274dbbf5d
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-16 10:16:39 -08:00
maxwell
1451db6cd8
fixed rspec build
2010-12-16 10:15:16 -08:00
danielvincent
43810907f5
show all contacts in edit aspect pane
2010-12-16 10:00:18 -08:00
Alec Leamas
e7f1190705
Pkg update (lost in git space)
2010-12-16 17:45:05 +01:00
Alec Leamas
472d1c8c84
Pkg update (bugfix)
2010-12-16 17:12:20 +01:00
Alec Leamas
a525669a4e
Pkg update (installation is also needed)
2010-12-16 15:43:48 +01:00
Alec Leamas
02477ed27a
Trying to cope with #722 for the moment.
...
Issue warning if there already is a running redis server, typically
the system server installed with the redis[-server] package.
See http://bugs.joindiaspora.com/issues/722
2010-12-16 12:19:10 +01:00
Alec Leamas
220e9ebd2c
Pkg update (major process control revision)
...
Never trust your test scripts... this has been an insane mess, and although
improved more bugs should be anticipated in this area. Sigh.
2010-12-16 11:51:46 +01:00
zhitomirskiyi
08c1142e4a
logging the number of open channels
2010-12-15 21:16:50 -08:00
maxwell
226d95ec2c
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 19:15:26 -08:00
Raphael
837ad20045
unpend spec in aspects controller spec
2010-12-15 18:11:09 -08:00
maxwell
d5ba34f245
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 18:05:54 -08:00
Raphael
e881edab96
Fix missing partials on last commit, you can now accept a request from the requestor's profile page
2010-12-15 18:05:18 -08:00
maxwell
8d91771cb2
xml escape things
2010-12-15 18:05:09 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
maxwell
cb5982704e
dont url escape, xml escape
2010-12-15 17:43:46 -08:00
maxwell
8ec85d3b12
basic notifications
2010-12-15 17:31:36 -08:00
Raphael
b22398951e
Send requests from the aspect list on the person show page
2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d
add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids
2010-12-15 14:48:14 -08:00
zhitomirskiyi
d34964651c
if aspect is not dropped it redirects back for consistency
2010-12-15 14:44:10 -08:00
zhitomirskiyi
4256ea34b6
rename aspect on the aspect show page
2010-12-15 14:15:07 -08:00
maxwell
9555fae33d
no notifications on retractions
2010-12-15 13:14:46 -08:00
maxwell
61b2bbbd7d
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 12:28:09 -08:00
maxwell
d5edc9b477
CGI::escaping for proper, good juju activity streams
2010-12-15 12:27:52 -08:00
MrZYX
14f2341ae1
updated locales
2010-12-15 21:26:27 +01:00
zhitomirskiyi
2abcd8d147
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 12:11:58 -08:00
maxwell
b6754d92b7
adding basic notification class
2010-12-15 12:11:47 -08:00
maxwell
a7d36615e6
adding basic notification class
2010-12-15 12:11:37 -08:00
Maxwell Salzberg
555542da31
remove extra slash
2010-12-15 12:01:20 -08:00
zhitomirskiyi
1212b34706
fadeOut on delete
2010-12-15 11:58:38 -08:00
Maxwell Salzberg
f8c2f15bb1
use the full pod_url in the template
2010-12-15 11:48:13 -08:00
Dan Hansen & Sarah Mei
82e2f23f91
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 14:29:33 -05:00
Raphael
e539688e1c
Fix rake db:reset
2010-12-15 11:28:50 -08:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
maxwell
d75084c8d0
remove GS from 500 page
2010-12-15 10:16:33 -08:00
Dan Hansen & Sarah Mei
b372e813f3
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 01:21:44 -05:00
Dan Hansen & Sarah Mei
fbfe28bcfa
added vimeo method, still needs support from lib/youtube_titles.rb. updated locales
2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88
Refactored the markdownify method.
2010-12-15 01:00:20 -05:00
Raphael
94fe0b4049
Do the update in JS
2010-12-14 21:54:18 -08:00
Raphael
bc35388d1f
Use find_each
2010-12-14 20:58:22 -08:00
zhitomirskiyi
1d1faea9e7
tiny typo
2010-12-14 19:50:22 -08:00
danielvincent
2cf332e120
Remove sent boolean from requests, finish migration
2010-12-14 19:27:18 -08:00
danielvincent
dea8d248e2
user only pushes to non-pending contacts
2010-12-14 19:11:35 -08:00
danielvincent
f1ee32145d
Remove pending_requests from user, just use Request.from and Request.to.
2010-12-14 19:00:03 -08:00
maxwell
0119de4afc
adding task to fix users with periods
2010-12-14 18:45:10 -08:00
maxwell
6bd42874e8
adding a task to fix person object with spaces in their name
2010-12-14 17:36:27 -08:00
maxwell
5d336d20e8
spelling fix
2010-12-14 17:36:27 -08:00
