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 181bd823c4, reversing
changes made to 2c3ed2ab73.
|
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 |
|
Raphael
|
5967ce25fd
|
add spec for youtube_titles
|
2011-01-28 11:43:15 -08:00 |
|
Raphael
|
a8306f9f37
|
don't select duplicate people
|
2011-01-27 13:41:22 -08:00 |
|
Raphael
|
31e4683183
|
Finished contacts of contacts for local users
|
2011-01-27 13:41:22 -08:00 |
|
Raphael
|
a23290986a
|
add contacts_visible field in aspects
|
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 |
|
Philip Champon
|
0588dafe6b
|
added enumeration to args and a spec to verify it
|
2011-01-27 12:46:02 -05:00 |
|
Raphael
|
f892a00b99
|
Fix data conversion, fixture generation in publicscontroller
|
2011-01-26 18:39: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
|
9e22f4a6e6
|
checks if you already invited the person
|
2011-01-26 16:31:34 -08:00 |
|
zhitomirskiyi
|
1a911a8b99
|
translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier)
|
2011-01-26 16:01:57 -08:00 |
|
zhitomirskiyi
|
6242ac64ed
|
removed unique index on email to a regular index in order to make inviting users through fb work (no email present)
|
2011-01-26 15:04:46 -08:00 |
|
zhitomirskiyi
|
be57170bf9
|
added the empty email spec
|
2011-01-26 14:22:04 -08:00 |
|
zhitomirskiyi
|
89a8817ce6
|
made service#invite redirect to the right place
|
2011-01-26 12:16:48 -08:00 |
|
zhitomirskiyi
|
3392f11b64
|
Job::InviteUser -> Job::InviteUserByEmail
|
2011-01-26 12:16:48 -08:00 |
|
zhitomirskiyi
|
5c5e450a1e
|
Invitation.new_or_existing_user_by_email -> Invitation.new_or_existing_user_by_service_and_identifier
|
2011-01-26 12:16:47 -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
|
cf45f31712
|
facebook friend finder is now contact-aware
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
f3f38cf4fd
|
fetch person object associated with facebook id in friend finder
|
2011-01-26 12:16:46 -08:00 |
|
zhitomirskiyi
|
8bc52cdb55
|
facebook friend finder gathers fb friends.
|
2011-01-26 12:16:46 -08:00 |
|
Raphael
|
e890d73de7
|
Remove mocha
|
2011-01-26 11:52:14 -08:00 |
|
Raphael
|
e4ad229a5a
|
Requestors are now high in search
|
2011-01-25 18:24:11 -08:00 |
|
Raphael
|
906cb36adf
|
Fix double notifications on comments, write a bunch of comment dispatch tests. Alliterate.
|
2011-01-25 16:46:51 -08:00 |
|
Raphael
|
def20a4d31
|
Make person_id on profile unique, delete duplicate profiles in migration
|
2011-01-25 12:10:24 -08:00 |
|
Raphael
|
5fe0613a97
|
Remove extra token from search
|
2011-01-25 10:47:11 -08:00 |
|
zhitomirskiyi
|
2314c08265
|
current password requirement to change password
|
2011-01-24 22:39:57 -08:00 |
|
zhitomirskiyi
|
716899f919
|
don't dispatch locally on comments if you're the post owner
|
2011-01-24 19:13:48 -08:00 |
|
maxwell
|
d040de541a
|
fix error in stream and puts in fake
|
2011-01-24 19:09:38 -08:00 |
|
zhitomirskiyi
|
8f05b638b3
|
holy crap fixed that comment dispatch bug
|
2011-01-24 18:21:27 -08:00 |
|
maxwell
|
ed1dc584d1
|
make aspects#index slow for ci
|
2011-01-24 18:03:14 -08:00 |
|
maxwell
|
a28a861509
|
fix url helpers on fakes
|
2011-01-24 18:01:40 -08:00 |
|
zhitomirskiyi
|
e9e01e965e
|
fixed error with comments saving twice on the same pod
|
2011-01-24 17:24:29 -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 |
|
Sarah Mei
|
0b39359d1c
|
Standardize how we're requiring config/environment
|
2011-01-23 12:42:09 -08:00 |
|
Dan Hansen
|
ace9e8c3d8
|
whoops, add license to embedder.js and it's spec
|
2011-01-22 23:43:48 -06:00 |
|
Dan Hansen
|
bdf559bb2b
|
remove video embedding from stream.js, use embedder.js
|
2011-01-22 23:40:08 -06: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
|
403490364a
|
fixed datapoint_spec. fixed labels on graph
|
2011-01-21 10:50:53 -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
|
56831cec63
|
stats WIP
|
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 |
|
zhitomirskiyi
|
f89c442730
|
statistics class does distributions and averages on its DataPoints
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
55bfbfd5b0
|
added users_with_posts_today to DataPoint
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
ecb059b661
|
added Statistic and DataPoint models
|
2011-01-21 10:29:06 -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 |
|
Raphael
|
7217bba7e7
|
Allow no 2 character queries
|
2011-01-20 12:18:42 -08:00 |
|
Raphael
|
971c88da5e
|
Sort search results by friend status
|
2011-01-20 10:20:17 -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
|
e97081e8cd
|
Delete some pending specs, fix a minor bug
|
2011-01-19 17:11:33 -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 |
|
Sarah Mei
|
b43c29745b
|
Fix build by turning off transactional fixtures in the import spec.
|
2011-01-19 00:16:11 -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 |
|
maxwell
|
7a02a31440
|
fix invitations#new, and a post spec which was mongo specific
|
2011-01-18 22:11:58 -08:00 |
|
danielvincent
|
4f25dfa6d3
|
publics controller merge fix
|
2011-01-18 17:14:32 -08:00 |
|
danielvincent
|
3dd2384458
|
Merge branch 'fixturebuilder'
Conflicts:
spec/controllers/people_controller_spec.rb
spec/controllers/publics_controller_spec.rb
spec/lib/diaspora/parser_spec.rb
|
2011-01-18 17:05:44 -08:00 |
|
danielvincent
|
1fa39ad20d
|
fixed issue in attack_vectors_spec
|
2011-01-18 16:58:59 -08:00 |
|
danielvincent
|
511a48adde
|
fixed publicscontroller specs
|
2011-01-18 16:52:11 -08:00 |
|
zhitomirskiyi
|
ef1b7644f3
|
got rid of more hash from
|
2011-01-18 16:38:31 -08:00 |
|
zhitomirskiyi
|
004094d66f
|
fixed the querying in the controllers got rid of hashes
|
2011-01-18 16:21:14 -08:00 |
|
Raphael
|
6ccf8a4d2d
|
Fixed connecting spec, magic import failure disappearance
|
2011-01-18 16:05:50 -08:00 |
|
Raphael
|
bad7399eeb
|
Remove yml files from git
|
2011-01-18 15:18:58 -08:00 |
|
Raphael
|
88ebd14799
|
Fixture builder working, need to make specs not require a clean db
|
2011-01-18 14:53:46 -08:00 |
|
Raphael
|
1353929d44
|
Made specs work with fixtures, spec_helper needs work
|
2011-01-18 13:31:10 -08:00 |
|
Raphael
|
ac3d037dc4
|
Comments controller spec using fixtures
|
2011-01-18 10:48:06 -08:00 |
|
Raphael
|
b580b7bd2c
|
Putting fixtures in specs...
|
2011-01-18 10:42:50 -08:00 |
|
Raphael
|
fdc9534fc7
|
Fix specs in the presence of fixture_builder
|
2011-01-18 10:25:26 -08:00 |
|
Raphael
|
345d346224
|
Initial fixture_builder
|
2011-01-18 10:00:48 -08:00 |
|
Raphael
|
6474ca9540
|
display photos correctly
|
2011-01-17 19:34:33 -08:00 |
|
maxwell
|
0c24510682
|
remove an invalid spec
|
2011-01-17 18:33:30 -08:00 |
|
zhitomirskiyi
|
8818a9bb6f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-17 18:04:21 -08:00 |
|
zhitomirskiyi
|
c28b5a22fb
|
here you go
|
2011-01-17 18:03:15 -08:00 |
|
Raphael
|
8bd784e5ab
|
Fix aspect edit
|
2011-01-17 17:36:36 -08:00 |
|
zhitomirskiyi
|
0c8aca3ef8
|
rebasing
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
7f87825186
|
fixed nil error in migration when dealing with remote images
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
1d52e06532
|
added rake task and spec for absolutifying existing image links
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
2eb1901073
|
s3 support minus rake migration.
|
2011-01-17 15:56:06 -08:00 |
|
Raphael
|
bd4efe8c2d
|
Escape youtube titles
|
2011-01-17 15:39:46 -08:00 |
|
Raphael
|
a7e30adc28
|
Better test for unique contacts
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
6410355d71
|
Fix aspect edit page
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
6eb0dfb43f
|
Improve User#posts_from
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
72785a69cb
|
Correct ordering problem in posts_from
|
2011-01-17 12:21:38 -08:00 |
|
Raphael
|
36781481bb
|
Pulling in changes from master
|
2011-01-17 11:41:15 -08:00 |
|
Sarah Mei
|
2c91bfca96
|
Fix spec that fails under ruby 1.9.
|
2011-01-15 15:00:45 -08:00 |
|
Sarah Mei
|
eeba0e7a63
|
Remove a spec that tests a method that doesn't exist anymore.
|
2011-01-15 14:28:15 -08:00 |
|
Sarah Mei
|
795f715833
|
Fix notification spec to stub the right association.
|
2011-01-15 14:20:25 -08:00 |
|
Raphael
|
f87ddffc64
|
2 failures left in merge
|
2011-01-14 16:35:41 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
Dan Hansen
|
d4f30ded1b
|
Diaspora.js 2.0, added an official widget, don't use native alerts anymore
|
2011-01-14 14:54:44 -06:00 |
|
Raphael
|
ae57c7a232
|
Stop testing on created_at, because I am so not updating the fixtures and we do have to export the times.
|
2011-01-13 19:59:01 -08:00 |
|
Raphael
|
300e055933
|
It turns out comments weren't importing because I didn't write the code to make them import.
|
2011-01-13 18:48:32 -08:00 |
|