Raphael
|
b8648f631a
|
Use ree in the chef scripts, might revert later
|
2010-12-17 12:49:44 -08:00 |
|
maxwell
|
3c3e03993a
|
make the two links on comment notifications clearer
|
2010-12-17 11:48:08 -08:00 |
|
maxwell
|
5763b441be
|
fixing order of Notification.for
|
2010-12-17 11:37:33 -08:00 |
|
maxwell
|
39deac62fb
|
in words is not a helper
|
2010-12-17 11:05:58 -08:00 |
|
maxwell
|
0bdb6aaab5
|
more notification stuff
|
2010-12-16 19:00:32 -08:00 |
|
maxwell
|
92bbe4cd4c
|
added link to changelog, updated notifications
|
2010-12-16 18:28:22 -08:00 |
|
danielvincent
|
a41f45b846
|
contact count on home page
|
2010-12-16 18:21:06 -08:00 |
|
maxwell
|
b8a0abd122
|
updating notification views
|
2010-12-16 18:07:43 -08:00 |
|
Raphael
|
d2199fa1eb
|
Profile of requestor should be visible; no outgoing request instance variable needed
|
2010-12-16 14:09:55 -08:00 |
|
danielvincent
|
f821f49db1
|
added similar contacts to contact pages
|
2010-12-16 11:49:08 -08:00 |
|
danielvincent
|
43810907f5
|
show all contacts in edit aspect pane
|
2010-12-16 10:00:18 -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 |
|
Raphael
|
3b727dc887
|
Add share_with fancybox on search page, fix a couple of queries
|
2010-12-15 17:45:12 -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
|
4256ea34b6
|
rename aspect on the aspect show page
|
2010-12-15 14:15:07 -08:00 |
|
Maxwell Salzberg
|
555542da31
|
remove extra slash
|
2010-12-15 12:01:20 -08:00 |
|
Maxwell Salzberg
|
f8c2f15bb1
|
use the full pod_url in the template
|
2010-12-15 11:48:13 -08:00 |
|
Raphael
|
bd31ff3ee3
|
Fix request validations, build.
|
2010-12-15 10:48:29 -08:00 |
|
danielvincent
|
f1ee32145d
|
Remove pending_requests from user, just use Request.from and Request.to.
|
2010-12-14 19:00:03 -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 |
|
maxwell
|
c38fbd27e4
|
prevent gifs thru getting through javascript uploader
|
2010-12-14 13:31:06 -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 |
|
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 |
|
Raphael
|
baa04ceac7
|
Add aspect list to contact page
|
2010-12-13 15:58:08 -08:00 |
|
maxwell
|
42c22cedf9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-12-13 14:38:47 -08:00 |
|
maxwell
|
8eb9ab1781
|
making image names more generic
|
2010-12-13 14:02:11 -08:00 |
|
mblog
|
d0355fdd43
|
Feature #348: Change Email
|
2010-12-13 22:14:52 +01:00 |
|
maxwell
|
4fe42044ac
|
removed homepage detail into a partial, which you should redefine
|
2010-12-13 12:52:08 -08:00 |
|
danielvincent
|
68a51448e5
|
comment link shows up again on contact pages
|
2010-12-13 10:19:04 -08:00 |
|
MrZYX
|
6cacfde6a6
|
two fixes to translations
|
2010-12-12 15:55:51 +01:00 |
|
danielvincent
|
2f2f8fef8a
|
delete/reshare only if current_user on stream_element
|
2010-12-12 01:41:54 -08:00 |
|
danielvincent
|
f7a7dff53b
|
allow for newlines in profile bio
|
2010-12-12 00:50:30 -08:00 |
|
danielvincent
|
52a3996ad0
|
textareas auto expand
|
2010-12-11 22:18:03 -08:00 |
|
Raphael
|
627561737c
|
Just get rid of some whitespace
|
2010-12-11 20:34:25 -08:00 |
|
danielvincent
|
b4170dc991
|
badges on stream elements. say 'all aspects' instead of listing out all user's aspect names
|
2010-12-11 20:28:40 -08:00 |
|
MrZYX
|
0d70f78a12
|
small translation fix
|
2010-12-11 22:03:06 +01:00 |
|
danielvincent
|
c9b498d59c
|
resolved 500 page on getting_started#step_3
|
2010-12-11 12:05:58 -08:00 |
|
danielvincent
|
fd2cbc1cf4
|
added invite link to search page
|
2010-12-10 18:28:51 -08:00 |
|
danielvincent
|
2c5d5d9328
|
show already invited users on invitation#new
|
2010-12-10 18:05:08 -08:00 |
|