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 |
|
Raphael
|
baa04ceac7
|
Add aspect list to contact page
|
2010-12-13 15:58:08 -08:00 |
|
maxwell
|
bcaeabdb87
|
remove some fields from our log that I dont want to see and dont help with managing a seed
|
2010-12-13 15:50:01 -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
|
d73ce4d8cf
|
making image names more generic
|
2010-12-13 14:02:20 -08:00 |
|
maxwell
|
8eb9ab1781
|
making image names more generic
|
2010-12-13 14:02:11 -08:00 |
|
MrZYX
|
045ba7c419
|
Merge branch 'email-validation' of https://github.com/themasch/diaspora into themasch-email-validation
|
2010-12-13 22:49:50 +01: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
|
502db347cc
|
removed homepage detail into a partial, which you should redefine
|
2010-12-13 12:52:23 -08: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 |
|
Alec Leamas
|
0f05d3e6f4
|
Pkg update
Features: working ubuntu README (old was a mess...)
|
2010-12-13 16:57:20 +01:00 |
|
MrZYX
|
c97af9cd03
|
pulled locals from 99translations
|
2010-12-13 16:20:05 +01:00 |
|
Mark Schmale
|
9a873aa760
|
added fix for Bug #695 to email-validation
|
2010-12-13 15:54:35 +01:00 |
|
Mark Schmale
|
4cc62ffaca
|
added spec for email validation
|
2010-12-13 15:46:19 +01:00 |
|
Mark Schmale
|
d163875577
|
added email validation. The border of the input field becomes red if the input seems to be invalid.
|
2010-12-13 15:46:19 +01:00 |
|
MrZYX
|
2946fea85a
|
Merge branch 'themasch-bug_659_cross_browser_charcode'
|
2010-12-13 15:34:30 +01:00 |
|
MrZYX
|
8c234fbaa4
|
forgot to add a new file
|
2010-12-13 15:19:16 +01:00 |
|
MrZYX
|
a89aa9c5ab
|
Merge branch 'bug_659_cross_browser_charcode' of https://github.com/themasch/diaspora into themasch-bug_659_cross_browser_charcode
|
2010-12-13 15:16:49 +01:00 |
|
MrZYX
|
a8d0d50173
|
pulled locales from rails-i18n. This overides the fix made to en-US.yml, please send it upstream
|
2010-12-13 15:11:22 +01:00 |
|
MrZYX
|
1284fcc92d
|
fix for #699
|
2010-12-13 15:04:11 +01:00 |
|
Mark Schmale
|
f5038cdc3c
|
replaced charCode by keyCode. On every browser, keyCode is filled
with the Unicode Character Code when used in keypress.
charCode is only supported in some browsers.
|
2010-12-13 11:55:54 +01:00 |
|
Dan Hansen
|
390587777f
|
more vendor prefix fixes
|
2010-12-13 01:21:54 -05:00 |
|
Dan Hansen
|
7c7254bf64
|
Vendor prefix police
|
2010-12-13 01:08:03 -05:00 |
|
Sarah Mei
|
3eaf7c48e6
|
white space police
|
2010-12-12 13:43:01 -08:00 |
|