Dan Hansen
|
2e9040e227
|
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
|
2011-08-10 23:57:33 -07:00 |
|
danielgrippi
|
db645e8da8
|
merged publics/show and posts/show
|
2011-08-10 18:07:38 -07:00 |
|
Raphael Sofaer
|
938b633c67
|
Don't check for what aspects you sent somebody else's posts to
|
2011-08-10 11:23:11 -07:00 |
|
Raphael Sofaer
|
cd0fca8462
|
Don't call aspects_with_post more than once, we can find a prettier place to cache it later
|
2011-08-10 10:38:11 -07:00 |
|
Manuel Schölling
|
ccecf32f9b
|
Show aspect title if message is posted only to one aspect
|
2011-08-10 10:38:10 -07:00 |
|
Manuel Schölling
|
cc3702d733
|
Added the number of aspects a message is posted to next to the 'limited' text
|
2011-08-10 10:38:10 -07:00 |
|
Maxwell Salzberg
|
77cb93be24
|
fix up the inviter sidebar
|
2011-08-08 17:53:04 -07:00 |
|
Manuel Schölling
|
fead6032f7
|
Issue 1586: added a aspect drop down next to the submit button in the publisher
|
2011-08-07 12:51:32 +02:00 |
|
Andrej Kacian
|
077d8fd2fe
|
Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher.
|
2011-08-06 23:37:21 +02:00 |
|
Raphael Sofaer
|
de3f27f8b1
|
We don't need to check defined? on an instance variable
|
2011-08-05 23:04:30 -07:00 |
|
danielgrippi
|
cd62064846
|
touched up aspect/edit and friend finder popups
|
2011-08-05 17:14:07 -07:00 |
|
Raphael Sofaer
|
c38c744156
|
Fix contact search in the facebook friend finder.
It was looking for #contact_list_search instead of .contact_list_search.
|
2011-08-05 12:34:48 -07:00 |
|
Maxwell Salzberg
|
ab74c6fd6b
|
attempt #2. sorry to the mailing list, we will get this fixed soon
|
2011-08-05 10:07:08 -07:00 |
|
Maxwell Salzberg
|
5d41c14e74
|
attempt to fix build
|
2011-08-05 09:44:35 -07:00 |
|
danielgrippi
|
6a56e3298c
|
only show connect to services if all services not already connected
|
2011-08-03 19:02:54 -07:00 |
|
danielgrippi
|
b11c1a899f
|
add invitations partial back, removed set_invites (yay)
|
2011-08-03 18:47:06 -07:00 |
|
danielgrippi
|
7d01deb99d
|
don't show connect to cubbies in right bar if user is already connected
|
2011-08-03 18:02:58 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c2dc5fde08
|
dg iz reworked the getting started into a tab, need to remove the getting started steps
|
2011-08-03 18:02:56 -07:00 |
|
Raphael Sofaer
|
67123a277c
|
Fix and simplify likes_container
|
2011-08-03 11:20:06 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
e42d7273a8
|
featured users section
|
2011-07-29 19:00:15 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
00571b84cd
|
completed donate option
|
2011-07-29 11:33:30 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
7327c882b2
|
the working button in diaspora
|
2011-07-29 11:33:29 -07:00 |
|
danielgrippi
|
6e25a6a0f1
|
touched up reshare view
|
2011-07-28 13:46:16 -07:00 |
|
Dennis Schubert
|
bbf28f9072
|
That fixes the mobile-interface for now
|
2011-07-28 21:45:42 +02:00 |
|
Jonne Hass
|
384a71bdc4
|
Merge pull request #1614 from ticho/1603-likes-i18n-fix
Fix for issue #1603 - use different i18n string for comment likes count
|
2011-07-25 07:20:24 -07:00 |
|
Raphael Sofaer
|
241999f72a
|
MS RS translated reshares
|
2011-07-22 17:58:52 -07:00 |
|
Raphael Sofaer
|
78bced56bb
|
Reshares and reshare retractions are green.
|
2011-07-22 16:00:19 -07:00 |
|
Andrej Kacian
|
c1e5a83f15
|
Fix for issue #1603 - use different i18n string for comment likes count
|
2011-07-22 19:57:18 +02:00 |
|
danielgrippi
|
2d6f51f68c
|
repost wip
|
2011-07-21 18:22:18 -07:00 |
|
danielgrippi
|
bdc4b9f746
|
marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back
|
2011-07-21 18:22:18 -07:00 |
|
danielgrippi
|
f3a515eef1
|
DG IZ reshare retractions is WIP
|
2011-07-21 18:22:17 -07:00 |
|
danielgrippi
|
d1bbbdbc4c
|
fixed all specs; rebased.
|
2011-07-21 18:22:17 -07:00 |
|
Ilya Zhitomirskiy
|
ce94779766
|
not showing the reshare button to the users on things they can't reshare
|
2011-07-21 18:22:17 -07:00 |
|
Maxwell Salzberg
|
fa9269541f
|
wip removed some generated specs
|
2011-07-21 18:22:17 -07:00 |
|
Maxwell Salzberg
|
06f886ad77
|
WIP reshare
|
2011-07-21 18:22:17 -07:00 |
|
Raphael Sofaer
|
f60a748c21
|
Ajax in the contacts for mentioning after page load
|
2011-07-15 14:23:44 -04:00 |
|
Arzumy MD
|
03e79da171
|
fixed missing i18n key for no_services
|
2011-07-13 12:17:47 +08:00 |
|
Raphael Sofaer
|
8f50c622fa
|
Fix contentUpdater spec, adjust migration and fix a couple of the js viwes
|
2011-07-11 16:17:11 -07:00 |
|
danielgrippi
|
d364f158b8
|
cache counters in for likes. pending Diaspora::Likeable module...
|
2011-07-11 15:05:55 -07:00 |
|
danielgrippi
|
797a6f5ca9
|
like comments js response wip
|
2011-07-11 15:02:46 -07:00 |
|
danielgrippi
|
2e15b6a61e
|
Likes in comments, cache counter disabled for now.
|
2011-07-11 15:00:48 -07:00 |
|
Raphael Sofaer
|
eafe6a7c85
|
Merge branch 'ajaxy-comments'
|
2011-07-11 14:05:45 -07:00 |
|
Raphael Sofaer
|
39ff51a9d7
|
Make comments index ajaxy
|
2011-07-11 14:03:59 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
594c9b02b1
|
A admin is now able to allow open invitations
|
2011-07-11 13:32:02 -07:00 |
|
danielgrippi
|
875eaffd42
|
added missing class to cubbies photos in the stream for the lightbox
|
2011-07-10 21:42:37 -07:00 |
|
danielgrippi
|
d69f89f689
|
forgot an attr on cubbies photos
|
2011-07-10 21:29:32 -07:00 |
|
danielgrippi
|
776368d45e
|
added left/right arrow events to the lightbox; lightbox only on stream element images for now
|
2011-07-10 21:09:00 -07:00 |
|
Raphael Sofaer
|
97ca10ddda
|
Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController
|
2011-07-10 20:06:31 -07:00 |
|
danielgrippi
|
6a165c0e3d
|
made show pages wider for status messages. made names blue in comments for easier reading
|
2011-07-10 18:54:38 -07:00 |
|
danielgrippi
|
7b7f3fc086
|
fix up aspects/edit popup a little
|
2011-07-10 18:34:47 -07:00 |
|
danielgrippi
|
029e9c55c2
|
don't display public posting option if not posting to all aspects
|
2011-07-07 15:50:33 -07:00 |
|
danielgrippi
|
fd015129c4
|
final touchups to hovercard
|
2011-07-06 13:51:19 -07:00 |
|
Raphael Sofaer
|
4a9900dff6
|
Fix some ui bugs on the post show page
|
2011-07-05 18:52:00 -07:00 |
|
danielgrippi
|
ecd79766ce
|
remove aspect badges
|
2011-07-04 22:36:21 -07:00 |
|
Raphael Sofaer
|
4f056dca8e
|
Ajax in likes in stream
|
2011-07-04 22:10:30 -07:00 |
|
Maxwell Salzberg
|
b645a77be9
|
translate a string in services#index view
|
2011-07-04 13:59:44 -07:00 |
|
Maxwell Salzberg
|
2f1118f95f
|
refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect
|
2011-07-04 13:54:05 -07:00 |
|
danielgrippi
|
403d18bac4
|
fixed content expander in comments; comments have a smaller limit than posts
|
2011-07-03 22:06:58 -07:00 |
|
danielgrippi
|
829c86823d
|
remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them
|
2011-07-03 20:08:11 -07:00 |
|
Raphael Sofaer
|
f161377480
|
Stop loading contact objects on the main page, all we need is people
|
2011-07-02 16:28:52 -07:00 |
|
danielgrippi
|
24d84d7756
|
fixed stupid 500 caused by publisher
|
2011-07-02 16:02:14 -07:00 |
|
danielgrippi
|
689bde2e5f
|
take out useless 'reshare'
|
2011-07-02 15:41:50 -07:00 |
|
danielgrippi
|
e0816ccc39
|
author info in stream element should be incased in a div. WHOOPS.
|
2011-07-01 22:12:43 -07:00 |
|
danielgrippi
|
41773cb29e
|
Almost done with left-nav, added link to aspect edit facebox, colored share button
|
2011-07-01 14:22:38 -07:00 |
|
danielgrippi
|
cd9be3904b
|
publisher rework
|
2011-07-01 10:51:45 -07:00 |
|
danielgrippi
|
60077bd70a
|
minor visual changes, more or less. facebox headers are now white.
|
2011-07-01 10:51:45 -07:00 |
|
danielgrippi
|
ca76db4550
|
DG RS left nav almost there. touched up publisher, among other things
|
2011-07-01 10:49:19 -07:00 |
|
Raphael Sofaer
|
1af945de11
|
Merge branch 'master' into oauth
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
|
2011-06-28 17:13:38 -07:00 |
|
Raphael Sofaer
|
5884a900a2
|
Get rid of manage
|
2011-06-24 16:55:40 -07:00 |
|
danielgrippi
|
a9b7cd1254
|
nicer auth prompt. wip.
|
2011-06-23 12:40:47 -07:00 |
|
Maxwell Salzberg
|
86f4f983f6
|
move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz
|
2011-06-16 11:17:14 -07:00 |
|
Raphael Sofaer
|
753be12a1f
|
Don't force a query on like count
|
2011-06-05 00:32:10 -07:00 |
|
MrZYX
|
82ca293825
|
fix services index with incomplete oauth_keys.yml
|
2011-06-02 13:20:22 +02:00 |
|
Maxwell Salzberg
|
5cbbdf2949
|
initial post to tumblr support
|
2011-06-01 22:30:22 -07:00 |
|
Maxwell Salzberg
|
a4017ba16f
|
small linebreak for cubbies view for mobile
|
2011-05-22 15:25:37 -07:00 |
|
danielgrippi
|
6a108104e8
|
add spacing
|
2011-05-21 14:56:11 -07:00 |
|
danielgrippi
|
0391795f80
|
better right pane sections
|
2011-05-21 14:52:59 -07:00 |
|
danielgrippi
|
f2259e5e25
|
put link in via link translation, add via link to mobile site
|
2011-05-19 16:06:29 -07:00 |
|
danielgrippi
|
d7899d10e3
|
Fix various links in to cubbi.es objects
|
2011-05-19 15:17:42 -07:00 |
|
danielgrippi
|
177061d1c5
|
added via links
|
2011-05-19 13:13:08 -07:00 |
|
danielgrippi
|
6c31867345
|
check for AS object in partial hack
|
2011-05-19 12:40:05 -07:00 |
|
danielgrippi
|
e7095ba788
|
Tests now pass, stream_element needs de-hacking
|
2011-05-19 12:19:27 -07:00 |
|
danielgrippi
|
c8e31825c5
|
Bookmark -> ActivitiyStreams::Photo
|
2011-05-19 11:57:06 -07:00 |
|
danielgrippi
|
41e1d0dd86
|
show photos from cubbies in the streams
|
2011-05-19 11:57:06 -07:00 |
|
danielgrippi
|
ebb17ff70c
|
few cucumber steps failing. wip.
|
2011-05-11 11:08:30 -07:00 |
|
danielgrippi
|
dfeb4f3a13
|
use .js response convention for remote likeke behavior
|
2011-05-11 11:08:30 -07:00 |
|
danielgrippi
|
eadede966f
|
unliking works right now minus on-page feedback
|
2011-05-11 11:08:30 -07:00 |
|
danielgrippi
|
8b081a48b4
|
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
|
2011-05-11 11:08:29 -07:00 |
|
Raphael Sofaer
|
160e01f7bd
|
Fix broken sorting by activity
|
2011-05-07 00:50:26 -04:00 |
|
Raphael Sofaer
|
4870ffb944
|
Fix db seed, refactor aspect-filters a bunch, fix stream_element a little
|
2011-04-13 18:13:26 -07:00 |
|
Raphael Sofaer
|
f13304073b
|
The specs are green on my dev machine, let's see if CI is still red
|
2011-04-13 15:19:17 -07:00 |
|
Raphael Sofaer
|
efe79eb351
|
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
|
2011-04-13 14:35:20 -07:00 |
|
Raphael Sofaer
|
157b117469
|
Just style links directly
|
2011-04-07 15:13:37 -07:00 |
|
Raphael Sofaer
|
d12ec38736
|
Fix mobile infinite scroll
|
2011-04-07 15:00:57 -07:00 |
|
maxwell
|
94d8fb9f3a
|
Revert "fpossible fix for mobile site 500 on user login"
This reverts commit fe52acb931.
|
2011-04-04 11:11:11 -07:00 |
|
maxwell
|
fe52acb931
|
fpossible fix for mobile site 500 on user login
|
2011-04-04 10:58:50 -07:00 |
|
MrZYX
|
f98a4ee42c
|
correct links to atom feed
|
2011-04-02 17:35:23 +02:00 |
|
danielgrippi
|
bdff036cda
|
remove spacing from stream elements
|
2011-04-01 11:26:04 -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 |
|