zhitomirskiyi
|
3392f11b64
|
Job::InviteUser -> Job::InviteUserByEmail
|
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 |
|
maxwell
|
75f08f8cb9
|
limit results in people#show to 15 posts
|
2011-01-25 14:21:15 -08:00 |
|
maxwell
|
cef10c1228
|
added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css
|
2011-01-24 23:18:24 -08:00 |
|
zhitomirskiyi
|
2314c08265
|
current password requirement to change password
|
2011-01-24 22:39:57 -08:00 |
|
maxwell
|
8b3beba93f
|
adding login page to mobile, and adding timeago WIP
|
2011-01-24 17:36:47 -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 |
|
danielvincent
|
7ac0e9eb49
|
wip
|
2011-01-24 12:22:18 -08:00 |
|
danielvincent
|
39c5189c1f
|
everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge.
|
2011-01-24 12:22:17 -08:00 |
|
Sarah Mei
|
46dcd07f39
|
Oops, debugging statement
|
2011-01-22 15:59:30 -08:00 |
|
zhitomirskiyi
|
ff375b71cb
|
works need a middle stage
|
2011-01-22 13:48:25 -08:00 |
|
Dan Hansen
|
67100aa7bb
|
fix the build
|
2011-01-22 00:39:53 -06:00 |
|
Dan Hansen
|
c23811e1ab
|
flash the user whether or not that person was moved to a different aspect
|
2011-01-21 20:02:42 -06:00 |
|
zhitomirskiyi
|
01a4327c2b
|
use google API instead of highcharts due to licensing
|
2011-01-21 13:00:08 -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
|
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 |
|
Raphael
|
88fa595d59
|
Move seed_aspects to after accept_invitation
|
2011-01-20 15:03:33 -08:00 |
|
maxwell
|
b21b0adca7
|
remove single user redirect
|
2011-01-20 15:02:46 -08:00 |
|
Raphael
|
4deec0cb38
|
Fix call to search in controller
|
2011-01-20 10:28:27 -08:00 |
|
Raphael
|
2c68bb0305
|
Remove n-query problem from contact_list
|
2011-01-19 18:06:35 -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
|
85b824babc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 22:12:11 -08:00 |
|
maxwell
|
7a02a31440
|
fix invitations#new, and a post spec which was mongo specific
|
2011-01-18 22:11:58 -08:00 |
|
Raphael
|
3935d978ac
|
Take some queries out of views
|
2011-01-18 19:11:01 -08:00 |
|
zhitomirskiyi
|
21bccedf9b
|
notification eagerly load the target
|
2011-01-18 17:22:48 -08:00 |
|
zhitomirskiyi
|
5ac194911f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 17:07:03 -08:00 |
|
zhitomirskiyi
|
e7a4c47f0a
|
include target for notification
|
2011-01-18 17:06:54 -08:00 |
|
Raphael
|
38dd58315d
|
typo
|
2011-01-18 17:04:22 -08:00 |
|
zhitomirskiyi
|
38a3193a61
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 16:58:04 -08:00 |
|
zhitomirskiyi
|
63590e2e7e
|
restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives"
|
2011-01-18 16:57:34 -08:00 |
|
danielvincent
|
511a48adde
|
fixed publicscontroller specs
|
2011-01-18 16:52:11 -08:00 |
|
Raphael
|
3b394c1c89
|
One more defualt scope out
|
2011-01-18 16:48:02 -08:00 |
|
Raphael
|
e6e2ba9cfb
|
Take out default scopes
|
2011-01-18 16:46:52 -08:00 |
|
zhitomirskiyi
|
ef1b7644f3
|
got rid of more hash from
|
2011-01-18 16:38:31 -08:00 |
|
zhitomirskiyi
|
3e6a271ad8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 16:22:03 -08:00 |
|
zhitomirskiyi
|
004094d66f
|
fixed the querying in the controllers got rid of hashes
|
2011-01-18 16:21:14 -08:00 |
|
Raphael
|
85bae12a00
|
Query on guid, not id
|
2011-01-18 16:07:58 -08:00 |
|
Raphael
|
28b7302c9e
|
Specify type again
|
2011-01-17 19:42:49 -08:00 |
|
Raphael
|
6474ca9540
|
display photos correctly
|
2011-01-17 19:34:33 -08:00 |
|
Raphael
|
8bd784e5ab
|
Fix aspect edit
|
2011-01-17 17:36:36 -08:00 |
|
zhitomirskiyi
|
fc92779ddc
|
redirect after contact destroy
|
2011-01-17 14:46:38 -08:00 |
|
Raphael
|
4ba58d8132
|
Simplify hashes_for_contacts
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
6410355d71
|
Fix aspect edit page
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
maxwell
|
f509367a40
|
fix the 404 page to show the dun goofed guy
|
2011-01-13 17:31:18 -08:00 |
|
zhitomirskiyi
|
9b6faa5644
|
added a notificaions read button
|
2011-01-12 16:24:14 -08:00 |
|
maxwell
|
1661158f95
|
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
|
2011-01-12 10:47:39 -08:00 |
|
danielvincent
|
f2f3059d72
|
fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl
|
2011-01-08 17:17:37 -08:00 |
|
danielvincent
|
6cc5d6e3ab
|
fixed all rspec/cucumber
|
2011-01-08 16:53:16 -08:00 |
|
danielvincent
|
cadba3f2b7
|
fixed specs with a reload. added header gradient for firefox
|
2011-01-08 13:11:55 -08:00 |
|
danielvincent
|
c74dc120df
|
fixed all cucumber tests
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
98bcad5c59
|
visual fixes on people/show. contact count on aspect filters. contact list searches again.
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
c9307305b3
|
collapsed aspect_listing and contact_listing on aspects/index
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
f44b3cbe3d
|
contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge.
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
e1b6f4f074
|
aspect filters shown selected on photo and statusmessage show pages
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
8c82a5974a
|
aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
5358ac32a1
|
photos can be posted to multiple aspects. header nav works from pages other than aspect/index.
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
b029475421
|
aspects now have edit pages accessible through the top nav
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
44d3c4bacd
|
fixed inf scroll on filters issue. one spec failing in AspectsController.
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
a773450650
|
aspect show fix
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
c64865d32e
|
header touchup
|
2011-01-08 13:11:51 -08:00 |
|
danielvincent
|
f1564d068a
|
pass @all_aspects as opposed to @aspects in stream
|
2011-01-08 13:11:51 -08:00 |
|
danielvincent
|
a9195d7730
|
aspect filters now functional on aspects/index
|
2011-01-08 13:11:51 -08:00 |
|
danielvincent
|
79b7f62520
|
filter logic in aspects_controller#index
|
2011-01-08 13:11:51 -08:00 |
|
maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -08:00 |
|
maxwell
|
5e58eba240
|
new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times
|
2011-01-05 17:43:25 -08:00 |
|
Raphael
|
d64fd2d222
|
Don't redirect to root_url on aspect destroy
|
2011-01-04 18:00:49 -08:00 |
|
Raphael
|
83d6b95c46
|
Merge remote branch 'nickvdb/763-notifications-paginate'
|
2011-01-04 16:18:46 -08:00 |
|
Raphael
|
0e55b0bf44
|
Merge remote branch 'tomk/721-wrong-person-link-when-creating-comment'
|
2011-01-04 16:14:39 -08:00 |
|
zhitomirskiyi
|
d3daa32558
|
mark a notification as read when you ignore a request
|
2011-01-04 11:27:25 -08:00 |
|
danielvincent
|
055fbe3e00
|
stream is now a div. generalized some partial extentions for mobile site.
|
2011-01-01 23:09:18 -05:00 |
|
Thomas R. Koll
|
5c7d39505a
|
Fixes #721 when creating a comment (ajax) the link to your own profile is fucked up and instead it linked to the user id
|
2010-12-30 00:48:43 +01:00 |
|
zhitomirskiyi
|
ddf95e2750
|
couple more passing cucumber stories, changed the queries on request and notification
|
2010-12-28 19:14:47 -08:00 |
|
Nick van der Burgt
|
b33056f72b
|
Fixed a small mistake
|
2010-12-28 22:03:13 +01:00 |
|
Nick van der Burgt
|
c7f3a9abfd
|
Pagination for the notifications
|
2010-12-28 21:54:41 +01:00 |
|
Sarah Mei
|
787d550a1f
|
Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly.
|
2010-12-27 21:48:51 -08:00 |
|
Raphael
|
a6dcaa2327
|
Photo specs passing, 9 failures left in mysql
|
2010-12-26 20:33:21 -08:00 |
|
Raphael
|
b642cd6840
|
Merging master into mysql
|
2010-12-26 16:30:17 -08:00 |
|
Michael Sofaer and Raphael Sofaer
|
7175200779
|
Fix a spec, need to move to a computer with firefox.
|
2010-12-24 15:17:24 -08:00 |
|
Michael Sofaer and Raphael Sofaer
|
30d60021f4
|
11 Controller specs remain in mysql. ALMOST DONE
|
2010-12-24 14:12:55 -08:00 |
|
Sarah Mei
|
1f67cc2485
|
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
|
2010-12-24 12:31:09 -08:00 |
|
Michael Sofaer and Raphael Sofaer
|
22a5832c01
|
Fix retraction related failures in mysql
|
2010-12-23 23:04:04 -08:00 |
|
Raphael
|
319452537e
|
Below 70 failures, GUIDs are next
|
2010-12-21 15:46:15 -08:00 |
|
danielvincent
|
a6c5f420fa
|
giving more pixels to photos on their show pages
|
2010-12-21 12:39:37 -08:00 |
|
maxwell
|
6d4696faf0
|
MS DG notifications are now pretty decent
|
2010-12-20 18:05:31 -08:00 |
|
maxwell
|
ed0e739ac3
|
updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with
|
2010-12-20 11:22:52 -08:00 |
|
Sarah Mei
|
c1bfbd358e
|
Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know.
|
2010-12-20 02:50:38 -08:00 |
|
Raphael
|
d44e76a6aa
|
Down to 250 failures in mysql
|
2010-12-20 00:36:48 -08:00 |
|
maxwell
|
c22894ff2a
|
limit number of notifications in notifications#index
|
2010-12-19 19:05:45 -08:00 |
|
danielvincent
|
6d63a5d3c5
|
fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller.
|
2010-12-19 17:50:07 -08:00 |
|
MrZYX
|
c3a79f7298
|
some fixes to translations
|
2010-12-18 15:25:21 +01:00 |
|
maxwell
|
84c041ba6a
|
aspects streams now ajax
|
2010-12-17 19:41:42 -08:00 |
|
maxwell
|
2e85a9fe66
|
notifications now can be read
|
2010-12-17 17:06:49 -08:00 |
|
maxwell
|
c749d81fe9
|
putting a link to notifications, make them unread in the controller when you view the index
|
2010-12-17 17:06:48 -08:00 |
|