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
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
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -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
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
Raphael
8a2e0eef7c
No semicolons in names
2011-02-02 16:57:04 -08:00
Raphael
cd8d9989cf
Refactor publisher JS, use hidden field for submitting
2011-02-02 14:27:14 -08:00
maxwell
3b77663481
people controller takes so much time on CI
2011-02-02 13:37:54 -08:00
zhitomirskiyi
21e3c2ae73
Merge branch 'open-aspects'
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/home_controller.rb
app/helpers/application_helper.rb
db/migrate/20110201013408_add_open_aspects_to_user.rb
spec/controllers/aspects_controller_spec.rb
spec/controllers/home_controller_spec.rb
2011-02-01 17:32:08 -08:00
zhitomirskiyi
59f1bff046
storing it as a boolean in the aspect
2011-02-01 17:25:15 -08:00
zhitomirskiyi
7f026e8271
now updating the open aspects in js
2011-02-01 16:58:33 -08:00
Raphael
cfd6639f4d
Revert "Merge branch 'open-aspects'"
...
This reverts commit 181bd823c42c3ed2ab73
2011-02-01 13:15:20 -08:00
zhitomirskiyi
27f1231479
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4
Merge branch 'open-aspects'
2011-02-01 12:10:12 -08:00
Raphael
7d18e2bcd8
Finish autocomplete
2011-02-01 11:56:56 -08:00
Raphael
518642d0d7
Move image_url defaulting logic into profile
2011-02-01 11:56:56 -08:00
Raphael
9080649180
Starting work on an autocomplete feature
2011-02-01 11:56:56 -08:00
maxwell
06013fabec
fix sm show
2011-01-31 21:50:06 -08:00
maxwell
13f482f3fe
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-31 21:45:05 -08:00
maxwell
7bb7bb396a
Revert "persists open aspects across logins also fixed the status message controller spec broken in master"
...
This reverts commit 9e7f03236e
2011-01-31 21:41:05 -08:00
Sarah Mei
59a6c3b3a0
Fix import database errors by not importing notifications
2011-01-31 21:36:10 -08:00
zhitomirskiyi
9e7f03236e
persists open aspects across logins also fixed the status message controller spec broken in master
2011-01-31 18:37:20 -08:00
zhitomirskiyi
789ff679a9
persists open aspects across logins also fixed the status message controller spec broken in master
2011-01-31 18:31:41 -08:00
zhitomirskiyi
a6c1b5bf59
mark notification as read on the status message show page
2011-01-31 15:26:20 -08:00
zhitomirskiyi
7a667abc73
unread true on notification receive
2011-01-31 15:09:01 -08:00
zhitomirskiyi
d6ab633e2c
Merge branch 'notification-migration'
2011-01-31 14:41:15 -08:00
zhitomirskiyi
ac50a0119a
spec for not raising on already existant actor
2011-01-31 10:23:26 -08:00
zhitomirskiyi
cfef9a747e
all green
2011-01-30 20:10:34 -08:00
Dan Hansen
a5365559d7
specs for view.flashes.render
2011-01-30 16:01:28 -06:00
zhitomirskiyi
a4988a28b4
WIP
2011-01-30 10:00:03 -08:00
zhitomirskiyi
17a2c9e311
moving over some code migration successful
2011-01-29 23:34:11 -08:00
Dan Hansen
55bee713e9
add more specs
2011-01-29 16:45:03 -06:00
Dan Hansen
be2413b9a8
load timeago widget
2011-01-29 16:02:04 -06:00
Dan Hansen
4484bf33fa
fix javascript i18n specs
2011-01-29 13:31:45 -08:00
Dan Hansen
9046273ebd
some specs for the i18n widget
2011-01-29 13:31:45 -08:00
Dan Hansen
d03119f7e9
Embedder is now a widget, show videos before comments
2011-01-29 13:22:34 -06:00
zhitomirskiyi
5940292840
build should be green now
2011-01-28 21:21:14 -08:00
Raphael
7302a54710
Fix translation missing error
2011-01-28 17:50:34 -08:00
zhitomirskiyi
9d091bbf6a
facebook invitations actually work
2011-01-28 17:22:18 -08:00
Raphael
07850c7cb2
fix fb finder, flesh out test
2011-01-28 17:13:20 -08:00
Raphael
8151f3b540
correct partial name
2011-01-28 16:54:30 -08:00
zhitomirskiyi
3b68fc3e9a
the friend finder is respecting of searchable
2011-01-28 13:45:58 -08:00
Raphael
dde8fd65e5
Fix build
2011-01-28 12:18:56 -08:00
