danielgrippi
|
bdff036cda
|
remove spacing from stream elements
|
2011-04-01 11:26:04 -07:00 |
|
maxwell
|
41bbcc9ac9
|
comment out comment delete on mobile site for now
|
2011-04-01 11:22:48 -07:00 |
|
danielgrippi
|
8b8ea03582
|
high res logo on mobile site
|
2011-04-01 11:12:41 -07:00 |
|
maxwell
|
4bd0cbfdc8
|
publisher now can handle services, and is on seperate page
|
2011-04-01 01:18:01 -07:00 |
|
maxwell
|
f2ca2c2357
|
fix up translations, and remote on publisher"
|
2011-03-31 23:52:29 -07:00 |
|
maxwell
|
569fb66e9e
|
bunch of small mobile ui fixes
|
2011-03-31 23:38:38 -07:00 |
|
maxwell
|
3add704d4a
|
sm mobile site fix
|
2011-03-31 22:25:28 -07:00 |
|
maxwell
|
bf45026040
|
another small fix for the mobile site
|
2011-03-31 18:35:21 -07:00 |
|
maxwell
|
69befc059d
|
ms iz fixed a bit of the mobile site
|
2011-03-31 18:32:19 -07:00 |
|
maxwell
|
bb59df46f9
|
updating jquery mobile, fix the menu page a bit
|
2011-03-31 18:19:51 -07:00 |
|
zhitomirskiyi
|
f99b724e0b
|
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
|
2011-03-31 17:23:54 -07:00 |
|
MrZYX
|
764e0c4aee
|
fixed #985
|
2011-03-31 18:59:00 +02:00 |
|
danielgrippi
|
b22b13d73f
|
Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
This reverts commit 326155af54.
|
2011-03-31 01:30:02 -07:00 |
|
zhitomirskiyi
|
bb4c2ee85d
|
added a character count to the publisher
|
2011-03-30 19:11:24 -07:00 |
|
danielgrippi
|
326155af54
|
popstate now in aspect-filters. back button now actually works on aspect/index.
|
2011-03-30 17:39:08 -07:00 |
|
Raphael Sofaer
|
3387c20b5f
|
Fix redirect away from conversation
|
2011-03-30 17:17:16 -07:00 |
|
Raphael Sofaer
|
1df287b2bb
|
Don't redirect ajax requests to getting_started
|
2011-03-30 17:02:19 -07:00 |
|
zhitomirskiyi
|
5a9ec82597
|
can now hide posts
|
2011-03-30 16:43:28 -07:00 |
|
zhitomirskiyi
|
fb8b8ab7fc
|
wip holding off until the follow model is done
|
2011-03-30 16:43:28 -07:00 |
|
Raphael Sofaer
|
e3ad078ba5
|
Scope querying in PhotosController#show
|
2011-03-30 16:40:01 -07:00 |
|
danielgrippi
|
5fa2a7a6f3
|
use popState in message inbox
|
2011-03-30 16:22:25 -07:00 |
|
Raphael Sofaer
|
716a7f64b8
|
Make contacts_visible accessible
|
2011-03-30 15:43:44 -07:00 |
|
Raphael Sofaer
|
8c9a7e1c41
|
Fix PhotosController#show
|
2011-03-30 15:43:44 -07:00 |
|
maxwell
|
66a52a49d6
|
add a loader for profile photo upload
|
2011-03-30 15:14:18 -07:00 |
|
Raphael Sofaer
|
c9d58d9308
|
Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings"
This reverts commit 3b7063d44a.
|
2011-03-30 14:47:40 -07:00 |
|
maxwell
|
c91baf9f04
|
pass the param to set the profile photo
|
2011-03-30 14:44:06 -07:00 |
|
Raphael Sofaer
|
3b7063d44a
|
Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings
|
2011-03-30 14:28:58 -07:00 |
|
maxwell
|
6364f2a332
|
clean activity streams, fix test
|
2011-03-30 14:27:20 -07:00 |
|
Raphael Sofaer
|
2d31d364f2
|
Don't will_paginate json requests on people search
|
2011-03-30 13:40:16 -07:00 |
|
danielgrippi
|
e922ef8f22
|
add includes() to search query for profiles
|
2011-03-30 13:24:47 -07:00 |
|
Raphael Sofaer
|
75354c1aba
|
fix error on mobite status message show
|
2011-03-30 12:51:02 -07:00 |
|
danielgrippi
|
d3c0f1b3d2
|
ruby objects, get outta my face. (conversationscontroller new)
|
2011-03-30 12:45:47 -07:00 |
|
Raphael Sofaer
|
5c7bd6298a
|
Fix 500 on tags index
|
2011-03-30 12:43:44 -07:00 |
|
MrZYX
|
d97939a18f
|
escape the ' in the json (don't ask me why the four \ are needed, it was trial and error :P)
|
2011-03-30 21:14:21 +02:00 |
|
maxwell
|
3ba7ce41f1
|
make the public page show the public profile if html request
|
2011-03-30 11:34:54 -07:00 |
|
zhitomirskiyi
|
70d1c31733
|
fixed the issue of nothing showing up for empty aspects
|
2011-03-30 11:29:12 -07:00 |
|
zhitomirskiyi
|
4a7326e035
|
WIP
|
2011-03-30 11:29:12 -07:00 |
|
danielgrippi
|
c4295a7693
|
fix aspect_memberships_controller specs
|
2011-03-30 11:15:40 -07:00 |
|
Raphael Sofaer
|
22b9f92c27
|
FIx post socketing
|
2011-03-30 10:55:59 -07:00 |
|
danielgrippi
|
95578e79c6
|
fix removing from aspect -> contact removal bug
|
2011-03-30 10:44:55 -07:00 |
|
maxwell
|
86fe2db24e
|
update publish job to include .atom
|
2011-03-30 10:41:47 -07:00 |
|
maxwell
|
fa27fa2d29
|
make one translation absolute to attempt to fix 1.9 build
|
2011-03-30 10:39:40 -07:00 |
|
MrZYX
|
53bdb2cade
|
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
|
2011-03-30 17:17:36 +02:00 |
|
MrZYX
|
699264e7a3
|
made flash messages for conversations translatable
|
2011-03-30 16:52:43 +02:00 |
|
MrZYX
|
22b73c736b
|
fixed #976
|
2011-03-30 16:15:31 +02:00 |
|
danielgrippi
|
5b0da52e0a
|
fixed comment socketing bug, post ordering on own profile page.
|
2011-03-29 19:40:44 -07:00 |
|
danielgrippi
|
b3cb8e0a2b
|
temp fix for pagination. photos index fix
|
2011-03-29 18:55:00 -07:00 |
|
danielgrippi
|
aa4c20e404
|
pass post to comments partial. use sql in raw_visible_posts
|
2011-03-29 17:31:57 -07:00 |
|
danielgrippi
|
371aa71ca8
|
add ordering to raw_visible_posts
|
2011-03-29 17:31:56 -07:00 |
|
danielgrippi
|
97d8b34599
|
Fix all specs, add foreign key constraints on post_visibility
|
2011-03-29 17:31:56 -07:00 |
|
danielgrippi
|
8816bd7f91
|
8 failures left. wip.
|
2011-03-29 17:31:56 -07:00 |
|
danielgrippi
|
9a0d6219b5
|
Moving PostVisibility to aspects, WIP, model specs pass
|
2011-03-29 17:31:56 -07:00 |
|
zhitomirskiyi
|
0aaaefeba2
|
fix tag plugin
|
2011-03-29 16:53:48 -07:00 |
|
zhitomirskiyi
|
d54a8428d3
|
add some limits for conversation#new
|
2011-03-29 15:19:14 -07:00 |
|
zhitomirskiyi
|
8775ab9d69
|
fixed the conversations create
|
2011-03-29 15:03:10 -07:00 |
|
zhitomirskiyi
|
ba15ea940b
|
autosuggest on tags now works, bumped up the version of the autocomplete plugin
|
2011-03-29 15:03:09 -07:00 |
|
zhitomirskiyi
|
2e25d1d745
|
added the bookmarklet into a box
|
2011-03-29 15:03:09 -07:00 |
|
zhitomirskiyi
|
a5bb26a3c4
|
almost done
|
2011-03-29 15:03:09 -07:00 |
|
maxwell
|
bbe5f56292
|
you can now mention in the bookmarklet
|
2011-03-29 13:55:14 -07:00 |
|
MrZYX
|
98820c0866
|
do not display tags on the public profile
|
2011-03-29 22:25:03 +02:00 |
|
maxwell
|
5392b5c6ef
|
strip more than 5 tags when updating profile so people with broken profiles can update again
|
2011-03-29 10:56:11 -07:00 |
|
MrZYX
|
aa478ddd5c
|
string concatenation with translations is bad, especially if you leave on part of it untranslated :P
|
2011-03-29 15:39:57 +02:00 |
|
maxwell
|
ccbba9b52e
|
fix translations
|
2011-03-28 20:09:09 -07:00 |
|
maxwell
|
8b7dc0a2cc
|
translated bookmarklet, added post to main page
|
2011-03-28 19:57:06 -07:00 |
|
maxwell
|
9e5890288c
|
more bookmarklet improvements
|
2011-03-28 18:34:52 -07:00 |
|
maxwell
|
f08b5dfafe
|
basic functionality done, fixing rough edges
|
2011-03-28 18:11:59 -07:00 |
|
Raphael Sofaer
|
349aa13c05
|
Revert "reduce db quries on aspects#index"
This reverts commit 3af5e24ac6.
Conflicts:
app/controllers/aspects_controller.rb
|
2011-03-28 14:59:16 -07:00 |
|
Ritchie Wilson
|
a1b07d84e1
|
Next and Previous arrows for mobile photos
|
2011-03-28 16:04:29 -04:00 |
|
Raphael Sofaer
|
c33a952bbd
|
Forgot parens
|
2011-03-28 11:22:03 -07:00 |
|
Raphael Sofaer
|
a0d3921d72
|
Fix 500 on tag show with comments
|
2011-03-28 10:01:19 -07:00 |
|
MrZYX
|
c2a4c2157d
|
oh yeah it's delete_all on has_many, seems like I shouldn't code today…
|
2011-03-28 18:04:21 +02:00 |
|
MrZYX
|
824c4b38ad
|
dependent delete for likes
|
2011-03-28 17:54:07 +02:00 |
|
Sarah Mei
|
ffe48fe189
|
Refactor aspects#index to be easier to read; move some expensive operations after the guard clause
|
2011-03-27 19:19:25 -07:00 |
|
Sarah Mei
|
ae106e71ae
|
Move sort order to a before filter, because this index method is waaaaay too big.
|
2011-03-27 18:52:43 -07:00 |
|
MrZYX
|
5c4979ccf0
|
use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why
|
2011-03-28 00:09:07 +02:00 |
|
MrZYX
|
315fdabd76
|
let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases
|
2011-03-27 21:08:30 +02:00 |
|
MrZYX
|
e2f6427724
|
just realized that the change to AspectsController#index in the previous commit isn't needed
|
2011-03-27 17:26:17 +02:00 |
|
MrZYX
|
3af5e24ac6
|
reduce db quries on aspects#index
|
2011-03-27 17:22:35 +02:00 |
|
MrZYX
|
55417cf9e3
|
AspectsController#move_contact -> AspectMembershipsController#update
|
2011-03-27 13:29:36 +02:00 |
|
MrZYX
|
b689d4695b
|
refactor of routes.rb done so far; further refactor needs design decisions
|
2011-03-27 00:05:35 +01:00 |
|
MrZYX
|
11b0a2c19d
|
dependent destroy for likes
|
2011-03-26 21:47:40 +01:00 |
|
MrZYX
|
92d6b618aa
|
ups that shouldn't be in the previous commit
|
2011-03-26 17:41:58 +01:00 |
|
MrZYX
|
985d79acb5
|
some more refactoring to routes.rb
|
2011-03-26 17:38:49 +01:00 |
|
danielgrippi
|
8a2dd36b7e
|
Fix autocomplete JSON
|
2011-03-25 17:28:04 -07:00 |
|
Raphael Sofaer
|
aed190dc6d
|
cucumber for comment retractions, modified views
|
2011-03-25 16:26:03 -07:00 |
|
Raphael Sofaer
|
fef226156c
|
Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable?
|
2011-03-25 16:09:37 -07:00 |
|
Raphael Sofaer
|
b9af450628
|
Relayable retractions pretty much done
|
2011-03-25 16:09:37 -07:00 |
|
Raphael Sofaer
|
31f43696cb
|
Initial work on retracting comments
|
2011-03-25 16:09:37 -07:00 |
|
danielgrippi
|
40953d37bd
|
Put an upper limit on the per_page param
|
2011-03-25 15:31:23 -07:00 |
|
danielgrippi
|
f5a03fd6ed
|
Make public timeline of a user publicly accessible
|
2011-03-25 15:06:22 -07:00 |
|
danielgrippi
|
c0ce0d71b8
|
Make pending specs green, I think there are still some to_jsons where there should be as_json
|
2011-03-25 15:06:22 -07:00 |
|
danielgrippi
|
5dbbc79f65
|
added users_profile_image, home_timeline, fixed public_timeline
|
2011-03-25 15:06:22 -07:00 |
|
danielgrippi
|
517f3fd802
|
statuses/ and users/ GET routes
|
2011-03-25 15:06:22 -07:00 |
|
maxwell
|
c5b6cdff4e
|
make a public search method
|
2011-03-25 15:06:22 -07:00 |
|
maxwell
|
310f529914
|
dumb api console
|
2011-03-25 15:06:22 -07:00 |
|
maxwell
|
ea3d839e1c
|
initial public api'
|
2011-03-25 15:06:22 -07:00 |
|
MrZYX
|
56a6f0e43b
|
cleaned up craziness in users and likes routing, fixed #961
|
2011-03-24 03:02:14 +01:00 |
|
danielgrippi
|
b6d5165f2d
|
scroll to post on page if you can see it (via notification popup)
|
2011-03-23 17:16:30 -07:00 |
|
Raphael Sofaer
|
555a774668
|
Initial contacts_of_contact page
|
2011-03-23 16:42:53 -07:00 |
|
zhitomirskiyi
|
18c7c467c7
|
made the manage email prefs work
|
2011-03-23 16:36:16 -07:00 |
|
danielgrippi
|
535e686b2c
|
fixed tag ordering in stream_element partial
|
2011-03-23 16:24:12 -07:00 |
|
zhitomirskiyi
|
7a31531258
|
added location to the profile
|
2011-03-23 15:56:46 -07:00 |
|
Raphael Sofaer
|
ec8aed12bb
|
Limit similar contacts, need a see all page
|
2011-03-23 15:02:26 -07:00 |
|
zhitomirskiyi
|
804b0b534a
|
moved the tooltips to be under the icons
|
2011-03-23 14:23:25 -07:00 |
|
zhitomirskiyi
|
24db7a3b87
|
added tooltips to the service icons
|
2011-03-23 14:13:54 -07:00 |
|
danielgrippi
|
fb5bc2805d
|
fix cucumber
|
2011-03-23 12:42:07 -07:00 |
|
Raphael Sofaer
|
73d4bf4327
|
Remove unneeded callback
|
2011-03-23 12:00:47 -07:00 |
|
zhitomirskiyi
|
9abe22d5d2
|
added a dependant destroy to the service_users
|
2011-03-23 11:56:15 -07:00 |
|
zhitomirskiyi
|
8a9a95d854
|
added a flash notice
|
2011-03-23 11:45:06 -07:00 |
|
Raphael Sofaer
|
cc39243c88
|
Check for nil in facebook finder
|
2011-03-23 11:42:33 -07:00 |
|
zhitomirskiyi
|
1cfba68416
|
this should fix the getting started, going to test on staging first
|
2011-03-23 11:05:04 -07:00 |
|
Raphael Sofaer
|
dd11edf033
|
Take out extra callback
|
2011-03-23 10:42:27 -07:00 |
|
Raphael Sofaer
|
55c5b4e525
|
Just enqueue a job on service create for now, since our queues are empty. Resque status will let us run the job and show the user a spinny without locking up a thin
|
2011-03-23 10:41:34 -07:00 |
|
Raphael Sofaer
|
3e8f455cbc
|
Add after_create to queue an updateserviceusers job on service create. We'll see how it works
|
2011-03-23 10:41:34 -07:00 |
|
danielgrippi
|
b9b9d7e07d
|
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
|
2011-03-23 10:29:34 -07:00 |
|
danielgrippi
|
43315e14f9
|
sort contacts by name, not by a potentially nil field
|
2011-03-23 10:16:55 -07:00 |
|
zhitomirskiyi
|
e45a3503d0
|
on aspect edit the contacts are now sorted by first name
|
2011-03-22 18:01:17 -07:00 |
|
danielgrippi
|
0cab18d5aa
|
autofocus username on login page
|
2011-03-22 17:43:11 -07:00 |
|
danielgrippi
|
fe44ee8230
|
fix tab order in publisher; removed 'to mention...' text
|
2011-03-22 17:29:03 -07:00 |
|
danielgrippi
|
2b8b824230
|
fixed private mention popup in firefox
|
2011-03-22 17:25:32 -07:00 |
|
danielgrippi
|
a44ca157e6
|
added text to private message notification; user picture in popup
|
2011-03-22 17:14:37 -07:00 |
|
MrZYX
|
643a066691
|
moar translatable
|
2011-03-22 22:45:36 +01:00 |
|
Raphael Sofaer
|
8835559ae5
|
Additional logging to debug extra pvs
|
2011-03-22 13:44:55 -07:00 |
|
Sarah Mei
|
631163ec02
|
"Add contact" buttons on tag page are smaller and don't appear on top of names.
Moved some logic from view into user model.
|
2011-03-22 13:16:58 -07:00 |
|
maxwell
|
a036a8035f
|
add a plaintext layout for emails, and include a link to change your email settings in the emails
|
2011-03-22 12:26:38 -07:00 |
|
zhitomirskiyi
|
9f9082fbbd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-03-22 11:28:01 -07:00 |
|
zhitomirskiyi
|
23d6441d77
|
start people off with invites if the pod is open
|
2011-03-22 11:27:29 -07:00 |
|
maxwell
|
dc60181033
|
404 googlebotz left and right on public remote person pages
|
2011-03-22 11:26:39 -07:00 |
|
danielgrippi
|
728d0537cb
|
comment out likes just in the views for now
|
2011-03-22 10:53:46 -07:00 |
|
MrZYX
|
deff67f486
|
fixed a translation
|
2011-03-22 13:47:44 +01:00 |
|
Raphael Sofaer
|
fdd158d86a
|
Make urls not change on processing
|
2011-03-21 18:42:36 -07:00 |
|
Raphael Sofaer
|
85e0736e5b
|
Remove stray puts
|
2011-03-21 17:12:54 -07:00 |
|
Raphael Sofaer
|
2b997e70c2
|
Refactor image processing to use 2 uploaders. Federation and s3 need testing
|
2011-03-21 16:40:53 -07:00 |
|
Raphael Sofaer
|
a45103d0ef
|
Make post not found redirect clearer
|
2011-03-21 16:40:53 -07:00 |
|
zhitomirskiyi
|
4517c7c1b1
|
move service icons to right on publisher. swap out RSS for world icon
|
2011-03-21 16:23:27 -07:00 |
|
zhitomirskiyi
|
c929ce21ad
|
fixed validation on tag length in profile
|
2011-03-21 16:01:34 -07:00 |
|
zhitomirskiyi
|
058b74846a
|
removed the bring your friends message from the stream
|
2011-03-21 15:23:34 -07:00 |
|
zhitomirskiyi
|
821703f4d4
|
fixed url. photo
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
93d69c4ec7
|
fixed the views for the friend finder
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
aa5bef0c3f
|
calls the job on login does a sync call if the cache friends was not called before, fixed the views
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
dcc80d5b43
|
almost done, need to figure out how whats the deal with the controller not being called
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
70d71ec491
|
service users is green
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
ede7d4e8e2
|
made the job, broke outthe save_users, still need to do lifecycle callbacks
|
2011-03-21 14:56:50 -07:00 |
|
zhitomirskiyi
|
3afa14d341
|
wip
|
2011-03-21 14:56:50 -07:00 |
|
MrZYX
|
a2715ca963
|
fixed migration naming, fixed translation
|
2011-03-20 23:00:56 +01:00 |
|
MrZYX
|
1b1a23aa8f
|
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
|
2011-03-20 18:10:58 +01:00 |
|
Sarah Mei
|
c3612ee66d
|
Remove empty helper and spec files.
|
2011-03-19 22:39:21 -07:00 |
|
Sarah Mei
|
c3b9da8d37
|
Add specs to conversations#new. Unpending spec for create.
|
2011-03-19 22:30:58 -07:00 |
|
Sarah Mei
|
0b1fa4d014
|
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
|
2011-03-19 20:53:55 -07:00 |
|
Sarah Mei
|
c1bf68068f
|
Pull relationship action button from search results out into a partial.
Copyedit messages.
|
2011-03-19 15:59:56 -07:00 |
|