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
4a925d192f
refactored the api
2011-02-05 15:01:05 -08:00
zhitomirskiyi
da6e16b3a4
WIP
2011-02-05 15:01: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
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
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
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
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
31e4683183
Finished contacts of contacts for local users
2011-01-27 13:41:22 -08:00
Raphael
a6f8b2c14e
Add splunk logging for errors
2011-01-27 11:44:35 -08:00
zhitomirskiyi
01ce26cbf3
fixed errror on services inviter action, specs
2011-01-27 10:58:09 -08:00
Raphael
b67aca0ffc
Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns
2011-01-26 18:29:23 -08:00
zhitomirskiyi
a037575ebc
added invites in the tests
2011-01-26 18:14:17 -08:00
zhitomirskiyi
a610618057
display resend link if already sent invitation in friend finder
2011-01-26 16:57:39 -08:00
zhitomirskiyi
89a8817ce6
made service#invite redirect to the right place
2011-01-26 12:16:48 -08:00
zhitomirskiyi
d595a64169
new interface to send invitation WIP
2011-01-26 12:16:47 -08:00
zhitomirskiyi
b3467b5d17
pending specs for facebook inviter
2011-01-26 12:16:47 -08:00
zhitomirskiyi
8bc52cdb55
facebook friend finder gathers fb friends.
2011-01-26 12:16:46 -08:00
zhitomirskiyi
2314c08265
current password requirement to change password
2011-01-24 22:39:57 -08:00
maxwell
ed1dc584d1
make aspects#index slow for ci
2011-01-24 18:03:14 -08:00
maxwell
1b3c58c2c2
Use a fake to not allocate an AR model for every reference to a person
2011-01-24 15:13:52 -08:00
Dan Hansen
8619a2035c
green for the night
2011-01-22 01:16:52 -06:00
Dan Hansen
67100aa7bb
fix the build
2011-01-22 00:39:53 -06:00
Raphael
eea5b0a748
fix hcard link in webfinger profile
2011-01-21 15:03:11 -08:00
zhitomirskiyi
41993fe5da
use highcharts.js for stats
2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd
getting rid of gruff and it's imagemagic deps. made graphs on stats pending.
2011-01-21 11:11:58 -08:00
zhitomirskiyi
46cb9dd346
before auth filter
2011-01-21 10:39:10 -08:00
zhitomirskiyi
46b94bc130
all the specs pass with before each
2011-01-21 10:29:07 -08:00
zhitomirskiyi
69d6de2fe7
added views and graph generation for statistics
2011-01-21 10:29:07 -08:00
Maxwell Salzberg
fe0f16812f
ci sucks
2011-01-20 18:57:20 -08:00
maxwell
b21b0adca7
remove single user redirect
2011-01-20 15:02:46 -08:00
Maxwell Salzberg
a612f55739
aspects needs more time on ci
2011-01-19 19:12:46 -08:00
Raphael
5eb0bf6736
Speed up person show
2011-01-19 18:45:45 -08:00
Raphael
0f978b983a
be more generous to CI with times
2011-01-19 18:20:40 -08:00
Raphael
2c68bb0305
Remove n-query problem from contact_list
2011-01-19 18:06:35 -08:00
Raphael
a5b4dd2604
fix js bug, add spec
2011-01-19 16:58:01 -08:00
Raphael
ad48f4796c
Remove warning in aspectscontroller
2011-01-19 16:08:14 -08:00
maxwell
e7a065a521
make jobs have a base class, which will verify the activerecord connection before trying the job
2011-01-19 14:10:42 -08:00
maxwell
72e10cfad6
remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times
2011-01-18 22:45:43 -08:00
