zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
maxwell
43f17b3ed8
made toggle for post time on aspects#index
2011-02-18 16:47:44 -08:00
maxwell
3c8a87783f
stream order can take created at to be sorted by origin post time
2011-02-18 16:07:22 -08:00
maxwell
37a699ace1
stream order can take created at to be sorted by origin post time
2011-02-18 16:01:04 -08:00
maxwell
0bf3cae54a
MS IZ added spec from admin page, moved it to its own controller where it belongs
2011-02-18 11:35:24 -08:00
maxwell
e3b298c5d4
this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in"
...
This reverts commit dfa5d875c5
2011-02-17 19:01:42 -08:00
maxwell
2540c5adb9
adding person and profile to show
2011-02-17 18:15:35 -08:00
zhitomirskiyi
8196ee33dd
making instantiating an empty contact
2011-02-17 18:05:22 -08:00
zhitomirskiyi
23754ec3fb
added the files
2011-02-17 18:05:21 -08:00
zhitomirskiyi
16b7ec3990
pulled out share_with to be contact new and contact show
2011-02-17 18:05:21 -08:00
zhitomirskiyi
25671f07c7
refactor of a line
2011-02-17 18:05:21 -08:00
zhitomirskiyi
ba779e18d6
aspect memberships are now dependant delete_all on contact
2011-02-17 18:05:21 -08:00
zhitomirskiyi
1e6bf9c80e
MS IZ the cucumber now passes
2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b
iz ms wip fixing contactController destroy
2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb
aspect membership refactor complete
2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705
wip
2011-02-17 18:05:21 -08:00
maxwell
17a801394e
work in progress. need to update the views for the controller changes
2011-02-17 18:05:21 -08:00
maxwell
6858e2e543
crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging
2011-02-17 18:00:59 -08:00
Raphael Sofaer
2304827569
Only save the connected person if it has changed
2011-02-17 20:30:38 -05:00
danielvincent
fc9d9a4c55
make the invite friends dialog more obvious
2011-02-17 15:58:37 -05:00
MrZYX
b7ce51d206
Merge branch '680-error-on-login-goes-away-quickly' of https://github.com/grzuy/diaspora into flashmsg
2011-02-17 15:34:42 +01:00
Raphael Sofaer
cd7e4d6e8f
Requests create a read, rather than unread, notification
2011-02-16 23:44:25 -05:00
Gonzalo Rodriguez
11e431f640
Add flash message above the login form
2011-02-16 23:37:28 -02:00
MrZYX
dfa5d875c5
I18n: Workaround for a weired caching issue when multiple users are logged in
2011-02-16 22:40:18 +01:00
danielvincent
a636ceec7f
search does not wildcard on both sides of search term; is less dumb.
2011-02-16 12:41:45 -05:00
danielvincent
41f077e039
posts are ordered by recent comment activity instead of time created
2011-02-16 02:04:46 -05:00
Dan Hansen
e2ec4c0424
possibly fix the problem with js i18n that occurs on joindiaspora
2011-02-15 22:43:06 -06:00
zhitomirskiyi
90897099bd
not double saving photos
2011-02-15 17:24:35 -08:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
MrZYX
f7de3a216a
fixed a translation
2011-02-15 15:02:36 +01:00
MrZYX
54feaca998
redirect to the start page if there's no referer in photos#show
2011-02-14 22:25:21 +01:00
MrZYX
b4b3fd2bb3
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-14 21:50:54 +01:00
MrZYX
fbaf9d6e84
fixed translation in request accepted mail
2011-02-14 21:50:38 +01:00
maxwell
4111a0ae4e
make notifications return json for MuGMaN
2011-02-14 11:59:58 -08:00
danielvincent
164fe1c1b5
adjust column width, leading, serifs, etc. in stream for better readability.
2011-02-13 15:27:14 -08:00
MrZYX
965f4e2ea5
another weired case where a photo can have a .status_message_id but no .status_message
2011-02-13 21:08:32 +01:00
MrZYX
20e1316491
it can somehow happen that a person has no profile. somehow. idk why.
2011-02-13 19:29:04 +01:00
danielvincent
ca0d52c8e2
log character counts of status messages and comments
2011-02-13 00:17:34 -08:00
David Morley
6df0a25327
fix link to facebox
2011-02-12 14:57:35 -08:00
Raphael Sofaer
6a0a945986
Switch dispatch_post and add_to_streams
2011-02-12 13:36:46 -08:00
MrZYX
a572637e4c
fix a translation
2011-02-12 18:06:56 +01:00
MrZYX
3c089506ff
localize emails
2011-02-12 17:35:12 +01:00
zhitomirskiyi
936a51578a
renamed log line
2011-02-11 23:42:50 -08:00
zhitomirskiyi
971a319764
contacts size
2011-02-11 23:41:21 -08:00
Raphael Sofaer
de475ec4eb
Take error out of posting status messages with photos
2011-02-11 19:20:19 -08:00
Raphael Sofaer
3e2c9b4b94
set photo-message relations based on guid on federation
2011-02-11 18:47:26 -08:00
Raphael Sofaer
ff0f37ceea
eliminate one source of dup pvs
2011-02-11 18:25:57 -08:00
maxwell
2784f641ba
fix 500 when viewing a nonexsitaint status message
2011-02-11 18:13:01 -08:00
maxwell
e78ab6bca1
make html status message create redirect, also correctly name status_messageS_controller_spec.rb
2011-02-11 18:00:07 -08:00
maxwell
c6bdbc987a
strip whitespace on comments
2011-02-11 17:54:37 -08:00
maxwell
4b47de5b9e
do not 500 on public photo viewing, also redirect if there is no photo rather than 500ing
2011-02-11 17:47:29 -08:00
zhitomirskiyi
34dbc5a872
added mention created logging statement
2011-02-11 17:36:21 -08:00
zhitomirskiyi
ea3afa6720
added the mention explanation text
2011-02-11 17:31:23 -08:00
maxwell
dc08efacf9
strip mention html for services
2011-02-11 17:13:48 -08:00
zhitomirskiyi
2b650e6b6d
removed person can't be blank error message
2011-02-11 16:29:19 -08:00
zhitomirskiyi
9f239789b9
can remote the person from the last aspect from edit contact pane
2011-02-11 12:58:01 -08:00
Raphael Sofaer
bc22851dd2
Add a little bit of info to create_invitee logging
2011-02-11 12:09:02 -08:00
zhitomirskiyi
3b2d323448
fixed the notifications to call the base_class
2011-02-11 11:49:47 -08:00
Raphael Sofaer
cb73922a26
Take extra / out of view, thanks NPerry
2011-02-11 11:23:32 -08:00
Raphael Sofaer
b413513999
Merge remote branch 'rtzn/master'
2011-02-11 11:13:01 -08:00
zhitomirskiyi
6441977a7c
added the post author name to the text also commented email
2011-02-11 10:31:20 -08:00
zhitomirskiyi
0e9fdeeab0
destroy
2011-02-10 19:55:30 -08:00
zhitomirskiyi
4033c19323
destroy_all so that the callbacks are called
2011-02-10 19:50:21 -08:00
zhitomirskiyi
36d7973005
fixed the problem where notifications are not keeping track of the target id as well as making notifications for a mention be destroyed when a post is
2011-02-10 19:23:01 -08:00
Raphael Sofaer
bb58544a70
Add logging for GC (slight slowdown, but worth it for the data)
2011-02-10 15:52:00 -08:00
Raphael Sofaer
0b6375ae63
Increase comment size limit
2011-02-10 15:51:59 -08:00
Raphael Sofaer
d6f886fbe2
Double comment length limit
2011-02-10 15:51:59 -08:00
maxwell
a27b1b2648
make the mention in html email not a link
2011-02-10 14:43:23 -08:00
Raphael Sofaer
25aa4255dc
Add unix timestamp to request log
2011-02-10 13:57:16 -08:00
zhitomirskiyi
ca7b4e5477
fixed the build
2011-02-10 13:42:31 -08:00
zhitomirskiyi
717d2e09c9
fixed the translation in the email
2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
zhitomirskiyi
7b1abacfe6
wip
2011-02-10 12:39:05 -08:00
Raphael Sofaer
f1fe913527
Change up logging a little bit
2011-02-10 11:52:00 -08:00
Raphael Sofaer
a307519e94
Put avatar on cmment form all the time, fix socketed comment form
2011-02-10 11:05:12 -08:00
zhitomirskiyi
1296dde15b
this should speed up the finder
2011-02-09 22:39:13 -08:00
Raphael Sofaer
5eb487ed20
204, not 201
2011-02-09 18:04:44 -08:00
zhitomirskiyi
1da965616b
added an option to remove a contact from the last aspect, after a prompt
2011-02-09 17:47:27 -08:00
Raphael Sofaer
04f33c8034
Render an empty 201 in users update with a js request
2011-02-09 17:22:45 -08:00
Raphael Sofaer
7b3a2b07ee
Removed n-query, created mentions table
2011-02-09 16:07:25 -08:00
Raphael Sofaer
056bebd4f4
Autocompletion contacts now change with changing aspect selection
2011-02-09 16:07:25 -08:00
Raphael Sofaer
c11ffe93c0
Actually close the publisher on and with Publisher.close()
2011-02-09 16:07:25 -08:00
Raphael Sofaer
f8cec95d7a
no authentication, n-query in stream
2011-02-09 16:07:24 -08:00
Raphael
0000185875
Status messages now process mentions and output links
2011-02-09 16:07:24 -08:00
danielvincent
3efc31c68f
mention js working minus tracking keypresses with the hidden message field.
2011-02-09 16:07:24 -08:00
Raphael Jedidiah Sofaer
150f676332
Do a bunch of work on publisher autocompletion JS
2011-02-09 16:07:23 -08:00
Raphael
216a2c3cdb
write formatted_message
2011-02-09 16:07:23 -08:00
Raphael Sofaer
51e129b5c6
Don't call hashes_for_people if it is a json request in search
2011-02-09 16:05:02 -08:00
zhitomirskiyi
e75c285049
added created_at
2011-02-09 15:07:47 -08:00
zhitomirskiyi
e4d9ec64cd
moved tests and slayed the profile not updating bug
2011-02-09 13:33:42 -08:00
MrZYX
4328f72bfb
fixed piwik
2011-02-09 19:37:05 +01:00
Nicolas Berens
60b08b9b08
Merge remote branch 'upstream/master'
2011-02-09 06:56:07 +01:00
zhitomirskiyi
41d21c78ef
mend
2011-02-08 18:53:18 -08:00
zhitomirskiyi
6be63b88f0
added the pending request to the finder
2011-02-08 18:53:18 -08:00
danielvincent
80117d8ab6
added piwik and ga options to mobile layout
2011-02-08 17:39:41 -08:00
zhitomirskiyi
eecf1d5d82
fixed cucumber, localization, and css
2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
