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
zhitomirskiyi
a398184081
WIP
2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421
translating the warning about removing the person from the last aspect
2011-02-08 15:44:12 -08:00
zhitomirskiyi
a06ba9105b
uniqueness of aspect name through user non case sensitive
2011-02-08 14:52:47 -08:00
maxwell
a649d18cd7
add tests to see if timestamps are updated on recevie...they are not
2011-02-08 14:07:25 -08:00
MrZYX
6e0e46435e
localize dates
2011-02-08 16:26:56 +01:00
MrZYX
2c06397fd9
updated locales
2011-02-08 15:06:12 +01:00
danielvincent
151999c582
reference the right thing in mobile views
2011-02-06 23:49:22 -08:00
danielvincent
01cfeb65b2
fixed build
2011-02-06 23:42:01 -08:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
danielvincent
42993de739
added back to comments; avatar.
2011-02-06 09:26:24 -08:00
MrZYX
b26e214001
updated locales
2011-02-06 16:04:06 +01:00
zhitomirskiyi
c2d26e21c3
added a mobile invitation acceptance view, skipping getting started for now
2011-02-05 20:19:47 -08:00
zhitomirskiyi
e3170504b8
using blank instead of checking for nil, since mongo import make these bank
2011-02-05 16:53:14 -08:00
zhitomirskiyi
80da5917fa
gave more space to the already invited span
2011-02-05 15:56:08 -08:00
zhitomirskiyi
59f0dca7c7
Revert "publisher is now a hot widget"
...
This reverts commit 8039ab312a
2011-02-05 15:24:20 -08:00
zhitomirskiyi
4a925d192f
refactored the api
2011-02-05 15:01:05 -08:00
zhitomirskiyi
78c30b847e
added files
2011-02-05 15:01:04 -08:00
zhitomirskiyi
b49f54144e
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a
WIP
2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4
WIP
2011-02-05 15:01:04 -08:00
Dan Hansen
8039ab312a
publisher is now a hot widget
2011-02-05 16:47:43 -06:00
Dan Hansen
d533f46cd7
update widget regardless of scroll count
2011-02-04 15:21:42 -06:00
MrZYX
5b1737b817
updated locales
2011-02-04 19:11:39 +01:00
maxwell
ce010c24ec
update jquery mobile to a3
2011-02-03 20:41:38 -08:00
maxwell
ee02a073cd
toggle mobile site, when mobile device
2011-02-03 18:43:56 -08:00
maxwell
35bc4e3aad
attempt to rebind infield labels on comment form
2011-02-03 18:43:56 -08:00
Dan Hansen
22c1743886
only use more button have inf scroll happens 3 times
2011-02-03 20:38:49 -06:00
zhitomirskiyi
1fbcb3c3e5
added a special case for share bc js being slow
2011-02-03 16:16:45 -08:00
maxwell
1ed737c3b9
make aspects a link, and remove a big db query from the view
2011-02-03 16:15:51 -08:00
maxwell
9879a6eb99
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-03 15:21:59 -08:00
zhitomirskiyi
41bb7a8564
blank instead of nil
2011-02-03 15:16:00 -08:00
maxwell
84325edeb8
Revert "added prune method"
...
This reverts commit 7078937311
2011-02-03 15:10:54 -08:00
maxwell
7078937311
added prune method
2011-02-03 14:47:04 -08:00
danielvincent
7668e8d262
fix mobile_fu/ipad issue
2011-02-03 14:11:26 -08:00
zhitomirskiyi
d905021252
comment emails have text
2011-02-03 13:07:26 -08:00
danielvincent
8269e4b300
touched up photo show and status message show pages
2011-02-03 13:05:25 -08:00
danielvincent
9922c42f5e
corrected searchbox autocomplete width
2011-02-03 12:59:03 -08:00
Raphael
460f25e848
run gladiac's migration, rename migration file so it finds class
2011-02-03 11:55:36 -08:00
Raphael
8c9aa2242b
Merge remote branch 'gladiac/835-fixed-mysql-migration'
2011-02-03 11:30:14 -08:00
MrZYX
9ae6ba4d66
updated locales
2011-02-03 15:35:59 +01:00
Raphael
636242283b
Fix cucumber features
2011-02-02 18:49:45 -08:00
Raphael
7c59a5b4bd
Schema changed on rebuild
2011-02-02 18:24:53 -08:00
Raphael
3114672989
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-02 18:13:03 -08:00
Sarah Mei
e7cf5fc841
Fix/expand cucumber feature for new user signup.
...
Replace "wait for aspects page"-type steps with general wait for step.
2011-02-02 17:17:00 -08:00
Raphael
8a2e0eef7c
No semicolons in names
2011-02-02 16:57:04 -08:00
maxwell
7bfaf462c8
zomg actually set the db and use it
2011-02-02 15:33:19 -08:00
