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
|
9e5cf1e1a4
|
Fix person receive urls
|
2011-01-18 15:21:04 -08:00 |
|
zhitomirskiyi
|
41c83a7e19
|
mousedown so that new tab opening would make notification go down
|
2011-01-18 10:51:05 -08:00 |
|
zhitomirskiyi
|
0cb9f1c0d7
|
focus publisher on reshare
|
2011-01-18 10:51:05 -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 |
|
zhitomirskiyi
|
8d86585928
|
profile spec passes
|
2011-01-17 18:22:54 -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
|
3f21a05e3e
|
remove s3 setting
|
2011-01-17 16:46:39 -08:00 |
|
zhitomirskiyi
|
995d285fdd
|
ssl s3, attrs
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
0c8aca3ef8
|
rebasing
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
7ef89acf81
|
added the redirect to the nginx conf
|
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 |
|
zhitomirskiyi
|
fc92779ddc
|
redirect after contact destroy
|
2011-01-17 14:46:38 -08:00 |
|
zhitomirskiyi
|
be92f3866c
|
IZ MS fix 500 on commnet notificaions
|
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 |
|
zhitomirskiyi
|
79b613b0e5
|
MS IZ notifications now contain helpful test
|
2011-01-17 14:07:21 -08:00 |
|
Maxwell Salzberg
|
254c411bd9
|
prevent searching with spaces
|
2011-01-17 13:48:52 -08:00 |
|
Raphael
|
36781481bb
|
Pulling in changes from master
|
2011-01-17 11:41:15 -08:00 |
|
danielvincent
|
e2fdad02f1
|
css fixes, incl. timeago style fix on stream_element
|
2011-01-14 22:12:31 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
zhitomirskiyi
|
aba03ed5b0
|
added the locales for timeago
|
2011-01-14 11:46:38 -08:00 |
|
maxwell
|
641b805da2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 17:31:44 -08:00 |
|
maxwell
|
f509367a40
|
fix the 404 page to show the dun goofed guy
|
2011-01-13 17:31:18 -08:00 |
|
zhitomirskiyi
|
2c58630995
|
rails autoescapes in the link_to
|
2011-01-13 17:16:53 -08:00 |
|
maxwell
|
600e67d5d1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 16:31:35 -08:00 |
|
maxwell
|
f97a9fa017
|
added timeago jquery plugin. we now need to figure out a js translation scheme
|
2011-01-13 16:29:13 -08:00 |
|
maxwell
|
fc09b0fb40
|
add a max char count to commnets (500)
|
2011-01-13 14:49:17 -08:00 |
|
maxwell
|
b116362c5d
|
notifications for local comments
|
2011-01-13 13:02:02 -08:00 |
|
zhitomirskiyi
|
1748827f0a
|
photos show spec passes
|
2011-01-13 10:19:17 -08:00 |
|
Dan Hansen
|
43658b4923
|
only show prev/next if there is more than one photo, fixes #813
|
2011-01-13 01:03:37 -06:00 |
|
Dan Hansen
|
ce4fe1938c
|
remove references to fancybox, we use facebox
|
2011-01-13 00:24:10 -06:00 |
|
zhitomirskiyi
|
9b6faa5644
|
added a notificaions read button
|
2011-01-12 16:24:14 -08:00 |
|
maxwell
|
c832201bd9
|
remove trailing bracket from aspects#edit pane
|
2011-01-12 11:00:22 -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 |
|
MrZYX
|
137cde185f
|
unscope contacts
|
2011-01-12 16:03:19 +01:00 |
|
MrZYX
|
1319099cf3
|
made some strings translatable
|
2011-01-12 15:58:10 +01:00 |
|
maxwell
|
73821859e6
|
require pubsubhubub in the job'
|
2011-01-11 16:24:59 -08:00 |
|
maxwell
|
49b172f192
|
up with convention, down with case. pubsubhubbub now adhears to ruby caseing, rather than its own name weirdness
|
2011-01-11 15:04:03 -08:00 |
|
maxwell
|
25f388d903
|
MS DG made receive encapsulated in an object
|
2011-01-11 14:23:19 -08:00 |
|
maxwell
|
23de681cb8
|
DG MS moved receive methods to their respective models
|
2011-01-11 14:23:18 -08:00 |
|
maxwell
|
daab8e80ce
|
basic receive cleanup
|
2011-01-11 14:23:18 -08:00 |
|
Raphael
|
ee20b00f58
|
Only the time zone errors are left, and those could probably be ignored
|
2011-01-10 18:30:52 -08:00 |
|
danielvincent
|
685b809248
|
resque requires a job to be assigned to a queue. enable resque logging on posting to a hub
|
2011-01-08 18:13:54 -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
|
6ca0b0014b
|
fade in aspect badges on stream
|
2011-01-08 15:24:03 -08:00 |
|
danielvincent
|
55fa1646c7
|
swapped out delete text for 'x' on stream_elements. controls fade in on hover
|
2011-01-08 15:06:25 -08:00 |
|
danielvincent
|
9cf1f5a023
|
fixed reshare with filters
|
2011-01-08 13:11:55 -08:00 |
|
danielvincent
|
cadba3f2b7
|
fixed specs with a reload. added header gradient for firefox
|
2011-01-08 13:11:55 -08:00 |
|
danielvincent
|
c5e0c616b5
|
share with pane styles fixed
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
98ceb1ca6b
|
fixups on people/show. make photos scroll over header on show pages.
|
2011-01-08 13:11:54 -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
|
2e472ded94
|
new notification/request text on aspects/index
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
71ca93720b
|
contact lists functional on aspects/index. edit panes facebox in from header
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
c9307305b3
|
collapsed aspect_listing and contact_listing on aspects/index
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
3ff4b67ff0
|
touched up stream_element and comment partial
|
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
|
422f17a648
|
switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials.
|
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
|
0a07dd16b5
|
posts are properly socketed on filtered streams
|
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
|
d0b25814b1
|
publisher retains text when filtering stream
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
a773450650
|
aspect show fix
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
e6ae5e13e2
|
publisher works through ajax filters
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
f02c13ee73
|
filters are now working in ajax. inf. scroll and publisher pending ajax.
|
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
|
a82e59077b
|
pass opts to the postman when creating a post
|
2011-01-06 17:49:24 -08:00 |
|
maxwell
|
49225568cb
|
moar tests for pubsubjob
|
2011-01-06 17:34:40 -08:00 |
|
zhitomirskiyi
|
86154ba348
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 17:26:42 -08:00 |
|
maxwell
|
153c4925d6
|
test for pubsubhububb jobs
|
2011-01-06 17:19:13 -08:00 |
|
zhitomirskiyi
|
8f2cad776b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 17:14:59 -08:00 |
|
Raphael
|
89a41826c1
|
Started raw post import
|
2011-01-06 17:01:17 -08:00 |
|
zhitomirskiyi
|
249b62445f
|
added the files
|
2011-01-06 16:51:34 -08:00 |
|
maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -08:00 |
|
Raphael
|
e46b3e6cf3
|
Import raw services, I think we need to change the name of the type field (is it supposed to be in provider?) other than that, only posts remain.
|
2011-01-06 16:23:18 -08:00 |
|
zhitomirskiyi
|
0c8e6b0ba1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 15:56:20 -08:00 |
|
zhitomirskiyi
|
3fae950905
|
also commented notification and sending ids into resque so that it works
|
2011-01-06 15:56:03 -08:00 |
|
Raphael
|
283a5501be
|
Boolean values aren't importing; we may need SET statements for them
|
2011-01-06 14:58:42 -08:00 |
|
Raphael
|
7c4d35cf28
|
raw import of notifications, failing to pull in unread
|
2011-01-06 14:37:59 -08:00 |
|
Raphael
|
564dd993b7
|
raw import of Invitation
|
2011-01-06 14:30:38 -08:00 |
|
Raphael
|
a1419b9dc0
|
Person#owner_mongo_id should be null if the csv has an empty string
|
2011-01-06 14:16:51 -08:00 |
|
danielvincent
|
8074e481a3
|
stream fix on aspects/show
|
2011-01-06 13:51:59 -08:00 |
|