maxwell
|
d5edc9b477
|
CGI::escaping for proper, good juju activity streams
|
2010-12-15 12:27:52 -08:00 |
|
maxwell
|
a7d36615e6
|
adding basic notification class
|
2010-12-15 12:11:37 -08:00 |
|
Raphael
|
bd31ff3ee3
|
Fix request validations, build.
|
2010-12-15 10:48:29 -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
|
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 |
|
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 |
|
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
|
d9f25473d2
|
fix a bug with the notifier and attachment
|
2010-12-13 14:28:21 -08:00 |
|
maxwell
|
8eb9ab1781
|
making image names more generic
|
2010-12-13 14:02:11 -08:00 |
|
MrZYX
|
2ac54eeffe
|
Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email
|
2010-12-13 22:48:58 +01:00 |
|
MrZYX
|
3a13657087
|
fix for #557
|
2010-12-13 22:23:19 +01: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 |
|
Raphael
|
f861955d80
|
profile.image_url is set to :thumb_large in update_profile
|
2010-12-13 12:11:54 -08:00 |
|
danielvincent
|
68a51448e5
|
comment link shows up again on contact pages
|
2010-12-13 10:19:04 -08:00 |
|
MrZYX
|
1284fcc92d
|
fix for #699
|
2010-12-13 15:04:11 +01: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
|
d19353ed8f
|
added newline support to markdownify
|
2010-12-12 00:44:54 -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
|
6f62161442
|
invitation emails stripped of whitespace from form
|
2010-12-10 18:10:24 -08:00 |
|
danielvincent
|
2c5d5d9328
|
show already invited users on invitation#new
|
2010-12-10 18:05:08 -08:00 |
|
maxwell
|
c774685d52
|
users can now disable email notfications
|
2010-12-10 11:47:10 -08:00 |
|
danielvincent
|
8de5c5babd
|
fixing request bar on aspects#manage
|
2010-12-10 10:12:30 -08:00 |
|
MrZYX
|
36043845ca
|
fixed requires for ruby 1.9
|
2010-12-10 17:25:02 +01:00 |
|
MrZYX
|
0374ee436e
|
fixed untranslatable strings
|
2010-12-10 16:52:35 +01:00 |
|