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 |
|
Raphael
|
3b727dc887
|
Add share_with fancybox on search page, fix a couple of queries
|
2010-12-15 17:45:12 -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 |
|
maxwell
|
d24be269f2
|
small refactor of admin mail. don't call deliver in the method
|
2010-12-14 17:36:26 -08:00 |
|
danielvincent
|
aef5abf631
|
Correct some queries, look at incoming requests in search, explicit pending false in activate_contact
|
2010-12-14 17:33:07 -08:00 |
|
danielvincent
|
b1c0facfe6
|
initiating a request now just creates a pending contact instead of persisting a request
|
2010-12-14 17:11:43 -08:00 |
|
Raphael
|
06b7b1c99a
|
WIP pending contacts
|
2010-12-14 17:11:42 -08:00 |
|
Raphael
|
251cdec2ec
|
Add full request cycle cucumber feature
|
2010-12-14 17:11:42 -08:00 |
|
maxwell
|
c38fbd27e4
|
prevent gifs thru getting through javascript uploader
|
2010-12-14 13:31:06 -08:00 |
|
Raphael
|
d3850292d5
|
Don't query current_user.contacts on every action
|
2010-12-14 12:38:48 -08:00 |
|
Raphael
|
e63a8a4bfa
|
Take contact.person query out of the views, only query people once in hashes_for_aspects
|
2010-12-14 12:11:36 -08:00 |
|
danielvincent
|
fd9d1332fc
|
break service http into its own queue
|
2010-12-14 11:43:26 -08:00 |
|
maxwell
|
0bd13ec106
|
use blank instead of empty for the person#name helper
|
2010-12-14 11:30:06 -08:00 |
|
maxwell
|
2bc849fa90
|
only show permalink if the post is infact public. also, make destroy delete
|
2010-12-13 18:45:54 -08:00 |
|
maxwell
|
e3e3fd13e5
|
no trailing slash on pod url on login page. it just looks weird
|
2010-12-13 18:21:50 -08:00 |
|
zhitomirskiyi
|
7e3b2c6afd
|
removed the query from the contact list partial
|
2010-12-13 17:53:27 -08:00 |
|
maxwell
|
8ba619029e
|
adding about text on invite accept page
|
2010-12-13 17:24:33 -08:00 |
|
danielvincent
|
d6bb5291bc
|
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
This reverts commit 2ac54eeffe, reversing
changes made to 3a13657087.
|
2010-12-13 17:16:56 -08:00 |
|
maxwell
|
c2ad170506
|
re add 'remember me' button
|
2010-12-13 17:05:35 -08:00 |
|
Raphael
|
d44df7e977
|
put remove contact link under aspect membership
|
2010-12-13 16:40:05 -08:00 |
|
Raphael
|
02d76441e4
|
Merge branch 'aspect-list-on-profile'
|
2010-12-13 16:12:29 -08:00 |
|