danielgrippi
|
2d9b9270cb
|
go off of yesterday's stats (full day comparison)
|
2011-08-11 17:27:20 -07:00 |
|
danielgrippi
|
190332308b
|
started on the real stats page
|
2011-08-11 17:15:33 -07:00 |
|
Raphael Sofaer
|
e2b16ab16f
|
Correct my own spelling mistake
|
2011-08-11 17:10:49 -07:00 |
|
Raphael Sofaer
|
9a77d3518f
|
Mobile authorizations index view
|
2011-08-11 16:39:39 -07:00 |
|
Raphael Sofaer
|
c5726bb379
|
Don't show a hide post button to non-logged in users
|
2011-08-11 15:50:09 -07:00 |
|
danielgrippi
|
08f12ee348
|
fixed the 'a post' bug in notification emails
|
2011-08-11 14:40:45 -07:00 |
|
Andrej Kacian
|
55daaf2b6c
|
Make tag unfollow icon slightly larger and add a helpful tooltip to it
|
2011-08-11 23:33:59 +02:00 |
|
ticho
|
d63251e6a8
|
Merge pull request #1703 from ticho/fix-right-bar-target-contact-count
Show correct contact count in right bar when changing target aspect.
|
2011-08-11 14:09:34 -07:00 |
|
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
|
091cdd6f94
|
Basic contacts index page on the mobile site
|
2011-08-10 16:23:33 -07:00 |
|
danielgrippi
|
1e7a2f327b
|
use post_message in all mailer html views
|
2011-08-10 15:31:39 -07:00 |
|
Raphael Sofaer
|
e1dd1e2876
|
Make the devise password views work for mobile users, they're terrible but they display
|
2011-08-10 12:29:25 -07:00 |
|
danielgrippi
|
118d3720c4
|
added view for activitystreams public post
|
2011-08-10 11:24:51 -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
|
2d6a69cdc8
|
fix for 500s in liked emails for reshares and activity streams photos
|
2011-08-10 10:25:43 -07:00 |
|
Maxwell Salzberg
|
d22e5e7598
|
make some getting started text slightly cleaner
|
2011-08-10 09:38:54 -07:00 |
|
Sarah Mei
|
0b02653f44
|
Merge pull request #1694 from ticho/tag-list-has-unfollow-icon
Add a "unfollow" icon to each tag in followed tags listing
|
2011-08-09 21:44:21 -07:00 |
|
Raphael Sofaer
|
902edb6745
|
Make the tag autocomplete on the getting started page less broken
|
2011-08-09 18:55:34 -07:00 |
|
Maxwell Salzberg
|
1afc3f36f5
|
refix services in getting started
|
2011-08-09 18:04:44 -07:00 |
|
Maxwell Salzberg
|
7b1ff4cd7b
|
more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form
|
2011-08-09 18:02:50 -07:00 |
|
Maxwell Salzberg
|
da51259f32
|
update dates on some views, give the accept invite form some padding
|
2011-08-09 18:02:50 -07:00 |
|
Raphael Sofaer
|
3c4f6527ec
|
Don't render the back-to-top link on the landing page
|
2011-08-09 16:55:22 -07:00 |
|
Maxwell Salzberg
|
86e374b8ce
|
add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible
|
2011-08-09 16:54:24 -07:00 |
|
Raphael Sofaer
|
09ac50aaac
|
Let html photo view render for phones, get rid of duplicate host-meta view
|
2011-08-09 15:36:59 -07:00 |
|
Maxwell Salzberg
|
5a966c93b4
|
make inviter emails format agnostic
|
2011-08-09 14:49:17 -07:00 |
|
Andrej Kacian
|
2a970145c8
|
Added icon to directly unfollow a tag to listing of followed tags.
|
2011-08-09 22:45:06 +02:00 |
|
Maxwell Salzberg
|
72b734e3e8
|
scroll to top like a boss
|
2011-08-09 01:04:54 -07:00 |
|
Maxwell Salzberg
|
43bd8b6860
|
typo in the settings
|
2011-08-08 19:07:38 -07:00 |
|
Raphael Sofaer
|
97660e8f49
|
Fix some typos in the batch invitation email
|
2011-08-08 19:02:07 -07:00 |
|
Maxwell Salzberg
|
ee08d3cd5c
|
fix inviter a touch
|
2011-08-08 18:50:59 -07:00 |
|
Raphael Sofaer
|
f02b1dd3a2
|
Adjust and tweak batch invitation email. It might need a few more tables
|
2011-08-08 17:56:20 -07:00 |
|
Maxwell Salzberg
|
77cb93be24
|
fix up the inviter sidebar
|
2011-08-08 17:53:04 -07:00 |
|
Maxwell Salzberg
|
5bd9e7c53d
|
update email copy
|
2011-08-08 16:35:34 -07:00 |
|
Sarah Mei
|
ccf843b486
|
Merge pull request #1745 from ticho/unread-message-count-css-fix
Correctly space unread and total message counts in conversations list
|
2011-08-07 20:40:53 -07:00 |
|
Manuel Schölling
|
8b99ae9cb6
|
Changed translation and fixed misspelled function call
|
2011-08-07 22:00:23 +02:00 |
|
Manuel Schölling
|
79d0dfc7bb
|
added missing hang=>left and people's AspectMembershipDropdown is not a partial anymore
|
2011-08-07 12:53:22 +02:00 |
|
Raphael Sofaer
|
08ae8d23cc
|
aspect_membership_dropdown, not aspectmembership
|
2011-08-07 12:53:22 +02: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
|
6b64d7f55a
|
Correctly space unread and total message counts in conversations list
|
2011-08-07 04:06:26 +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 |
|
Sarah Mei
|
66bb686f4b
|
Handle the case where the pod doesn't have the diasporahq user.
|
2011-08-06 12:48:23 -07:00 |
|
Raphael Sofaer
|
e3d0cfedd7
|
Use 'Welcome' from i18n
|
2011-08-05 23:09:00 -07:00 |
|
Raphael Sofaer
|
de3f27f8b1
|
We don't need to check defined? on an instance variable
|
2011-08-05 23:04:30 -07:00 |
|
Raphael Sofaer
|
dde4b30180
|
Fix rspec specs
|
2011-08-05 22:29:27 -07:00 |
|
Maxwell Salzberg
|
c5d2dbfa95
|
add copy
|
2011-08-05 18:54:49 -07:00 |
|
Maxwell Salzberg
|
b4d4499299
|
adding invite email
|
2011-08-05 18:32:25 -07:00 |
|
Maxwell Salzberg
|
a3104741c5
|
cleanup inviter for more offical email
|
2011-08-05 17:55:56 -07:00 |
|
Raphael Sofaer
|
a35356cfc3
|
DG Fix 500 in person page when incoming_request is undefined
|
2011-08-05 17:33:10 -07:00 |
|
danielgrippi
|
5e1d1428d0
|
fix styles
|
2011-08-05 17:29:57 -07:00 |
|
danielgrippi
|
eb6d4c0228
|
remove dropdown from h4
|
2011-08-05 17:24:54 -07:00 |
|
danielgrippi
|
cd62064846
|
touched up aspect/edit and friend finder popups
|
2011-08-05 17:14:07 -07:00 |
|
danielgrippi
|
0cceb4fdd3
|
fixed people/contacts layout; pulled person sub-header into its own partial
|
2011-08-05 15:51:18 -07:00 |
|
Raphael Sofaer
|
5eadc7d41c
|
Fix the last broken jasmine spec by restoring the #no_posts div
|
2011-08-05 15:09:16 -07:00 |
|
danielgrippi
|
75c3107035
|
made signing up and accepting an invitation look a little nicer
|
2011-08-05 12:36:53 -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 |
|
Raphael Sofaer
|
9e007f2b11
|
Actually add the facebook inviter partial
|
2011-08-05 11:55:00 -07:00 |
|
Raphael Sofaer
|
6d3da0d0d1
|
Memoize the facebook invitation form on the facebook finder page
|
2011-08-05 11:31:45 -07:00 |
|
Daniel Grippi
|
f63ba2c557
|
Merge pull request #1707 from TheLambdaCalculus/b1696-publisher-should-automatically-collapse-if-last-photo-removed-and-otherwise-blank
Issue #1696 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
|
2011-08-05 10:57:33 -07:00 |
|
Daniel Grippi
|
a0cdf6869c
|
Merge pull request #1732 from ticho/no-posts-message-outside-of-stream
Move no_posts_message rendering above the stream
|
2011-08-05 10:28:00 -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 |
|
Andrej Kacian
|
2134fd2bc0
|
Move no_posts_message rendering above the stream, so that it doesn't get pushed down by new posts.
|
2011-08-04 21:45:22 +02:00 |
|
danielgrippi
|
6a56e3298c
|
only show connect to services if all services not already connected
|
2011-08-03 19:02:54 -07:00 |
|
Maxwell Salzberg
|
001d4ceaff
|
fix friend finder styling
|
2011-08-03 18:55:26 -07:00 |
|
danielgrippi
|
b11c1a899f
|
add invitations partial back, removed set_invites (yay)
|
2011-08-03 18:47:06 -07:00 |
|
danielgrippi
|
134e8a1b20
|
limit RSS rel link in layout to person pages
|
2011-08-03 18:30:25 -07:00 |
|
danielgrippi
|
9b24af717f
|
fix styling on featured users on getting started; added hovercards
|
2011-08-03 18:22:52 -07:00 |
|
Maxwell Salzberg
|
520b0dcf33
|
only show resend link
|
2011-08-03 18:18:00 -07:00 |
|
Maxwell Salzberg
|
275be550f8
|
aspects is not an li
|
2011-08-03 18:14:49 -07:00 |
|
danielgrippi
|
99ac976594
|
fix redirects around getting_started and aspect/index
|
2011-08-03 18:07:43 -07:00 |
|
danielgrippi
|
987d334764
|
fixed tests, translations, initalizer
|
2011-08-03 18:02:58 -07:00 |
|
danielgrippi
|
23c2eaf1c5
|
added a real profile description on the welcome tab
|
2011-08-03 18:02:58 -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 |
|
danielgrippi
|
e23439d193
|
fix cucumber; temporarily remove fetch featured users initilizer
|
2011-08-03 18:02:57 -07:00 |
|
danielgrippi
|
e589dd88b2
|
added has_connected_cubbies?
|
2011-08-03 18:02:57 -07:00 |
|
danielgrippi
|
120cf9835b
|
added more translations; welcome text switch
|
2011-08-03 18:02:57 -07:00 |
|
danielgrippi
|
b8b4ad3d84
|
added helpers for each of the getting started steps; make step sections dull if completed
|
2011-08-03 18:02:56 -07:00 |
|
danielgrippi
|
303b23883d
|
added featured users, left nav, and search boxes into getting started
|
2011-08-03 18:02:56 -07:00 |
|
danielgrippi
|
6369eefdbe
|
added translations to getting started
|
2011-08-03 18:02:56 -07:00 |
|
danielgrippi
|
c9eeeb6150
|
ms dg; profile (step 1) finished
|
2011-08-03 18:02:56 -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 |
|
Maxwell Salzberg
|
1ae7b80c56
|
some tweaks for friend finder styling
|
2011-08-03 18:00:38 -07:00 |
|
Raphael Sofaer
|
f1040a237f
|
Put the new_aspect class on the notification page aspect dropdown, so that the focus js is triggered
|
2011-08-03 17:47:52 -07:00 |
|
Maxwell Salzberg
|
099d882814
|
fix aspect dropdown when friend on diaspora
|
2011-08-03 17:38:30 -07:00 |
|
Maxwell Salzberg
|
7e8f17cc31
|
refactoring this stuff
|
2011-08-03 16:58:55 -07:00 |
|
Raphael Sofaer
|
67123a277c
|
Fix and simplify likes_container
|
2011-08-03 11:20:06 -07:00 |
|
danielgrippi
|
25e4f5d0ae
|
dg ms; made no posts text on person show more explicit
|
2011-08-02 12:53:36 -07:00 |
|
Raphael Sofaer
|
a542bb7a6d
|
Take comments out of the photo show page, they were broken anyway.
|
2011-08-02 11:10:42 -07:00 |
|
Raphael Sofaer
|
be5453f0b4
|
Fix photo show pages with likes
|
2011-08-02 10:17:49 -07:00 |
|
Raphael Sofaer
|
406ab7a073
|
Delete a stray file, some cleanup
|
2011-08-02 09:47:17 -07:00 |
|
Raphael Sofaer
|
d7ac6c4713
|
Link the no_tags text to a tag page, we should make tags#index something meaningful one day.
|
2011-08-01 17:59:19 -07:00 |
|
danielgrippi
|
6daf7f5ad9
|
add prompt to add more contacts if user has less than 2 contacts on aspect index
|
2011-08-01 15:31:13 -07:00 |
|
danielgrippi
|
756a20ecd4
|
link a user to featured users if user has zero contacts
|
2011-08-01 15:19:51 -07:00 |
|
Maxwell Salzberg
|
773f207b17
|
fix the viewport for real this time. sorry about all of the emails
|
2011-07-31 21:57:26 -07:00 |
|
Maxwell Salzberg
|
2fb2cd0a80
|
fix mobile viewport for mobile site
|
2011-07-31 21:33:43 -07:00 |
|
Gaelan D'costa
|
ba98043412
|
Issue #1126 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
|
2011-07-31 19:29:01 -04:00 |
|
Andrej Kacian
|
78c3d91abd
|
Show correct contact count in right bar when changing target aspect.
|
2011-07-31 12:29:56 +02:00 |
|
Gonzalo Rodriguez
|
3eb6d13f95
|
Issue #1431: Suggest when the first letter typed, not the third
|
2011-07-30 15:56:28 -03:00 |
|
danielgrippi
|
7504f66416
|
thumb small on comments
|
2011-07-29 19:34:50 -07:00 |
|
danielgrippi
|
91461ab2ad
|
fix tag duplication; photo sizes
|
2011-07-29 19:31:06 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
3a6f0583c7
|
added featured users dg iz
|
2011-07-29 19:00:15 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
e42d7273a8
|
featured users section
|
2011-07-29 19:00:15 -07:00 |
|
Maxwell Salzberg
|
a320891df0
|
sample users so they are random, not the same all the time
|
2011-07-29 17:16:37 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
fd27fdc204
|
fix facebox not closing when adding a contact to an aspect via the dropdown menu
|
2011-07-29 15:06:24 -07:00 |
|
danielgrippi
|
e345f2dcbc
|
fix contacts index page
|
2011-07-29 14:15:28 -07:00 |
|
Raphael Sofaer
|
6946d28243
|
Fix the build for socketing of comments.haml
|
2011-07-29 11:50:50 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
e17fe1848f
|
removed unused file
|
2011-07-29 11:39:41 -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 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
24fed68247
|
added the buttons
|
2011-07-29 11:33:29 -07:00 |
|
Raphael Sofaer
|
cac6d048f8
|
Fix mobile views of reshares
|
2011-07-29 11:21:13 -07:00 |
|
Maxwell Salzberg
|
7a43a812bf
|
show comment form for post show pages
|
2011-07-29 10:10:22 -07:00 |
|
Maxwell Salzberg
|
b2bce9e1b2
|
update jquery mobile to beta1
|
2011-07-28 23:32:41 -07:00 |
|
danielgrippi
|
68dafdbf0d
|
correct contact count on aspect/index
|
2011-07-28 16:23:31 -07:00 |
|
Raphael Sofaer
|
8ce5e72519
|
Use data-aspect_id, because integer html ids freak me out.
|
2011-07-28 15:51:00 -07:00 |
|
danielgrippi
|
ee95def580
|
removed js from the view. added grabbing hand while moving aspects
|
2011-07-28 15:34:01 -07:00 |
|
danielgrippi
|
dfa5824dc1
|
remove repeated link, fixed cucumber
|
2011-07-28 14:52:09 -07:00 |
|
Raphael Sofaer
|
87d0f9d6fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-07-28 14:42:02 -07:00 |
|
Raphael Sofaer
|
b367a486d3
|
Add helper clone to aspect sorting js, so that dragging doesn't click
|
2011-07-28 14:41:19 -07:00 |
|
Raphael Sofaer
|
ddd4424df8
|
Merge remote branch 'manuels/842-sortable-aspects'
Conflicts:
app/models/user.rb
db/schema.rb
|
2011-07-28 14:36:41 -07:00 |
|
danielgrippi
|
6e25a6a0f1
|
touched up reshare view
|
2011-07-28 13:46:16 -07:00 |
|
Raphael Sofaer
|
37bb641227
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-07-28 13:03:06 -07:00 |
|
Dennis Schubert
|
bbf28f9072
|
That fixes the mobile-interface for now
|
2011-07-28 21:45:42 +02:00 |
|
Raphael Sofaer
|
4fa5731d5e
|
Merge remote branch 'jancborchardt/1410-messages-conversation'
Conflicts:
app/views/conversations/new.haml
|
2011-07-28 12:45:40 -07:00 |
|
Raphael Sofaer
|
192ae3a52b
|
Merge remote branch 'ticho/followed-tag-listing-separate-file'
|
2011-07-28 12:33:14 -07:00 |
|
Raphael Sofaer
|
d043c74528
|
Merge remote branch 'ticho/highlight-unread-conversations'
|
2011-07-28 12:17:39 -07:00 |
|
Ryan Hughes
|
2a187ae770
|
Likes don't return 500 errors.
|
2011-07-27 23:26:54 -07:00 |
|
Raphael Sofaer
|
4a1bd27728
|
Merge pull request #1677 from ticho/conversations-send-button-action-string-fix
Use "Sending..." instead of "Posting..." for new conversation.
|
2011-07-27 17:54:35 -07:00 |
|
Raphael Sofaer
|
6406de89ee
|
Merge remote branch 'gandaro/1602-delete-profile-photo'
|
2011-07-27 17:19:47 -07:00 |
|
Andrej Kacian
|
e4a81fbc8a
|
Use "Sending..." instead of "Posting..." for new conversation.
|
2011-07-27 23:09:05 +02:00 |
|
Andrej Kacian
|
cc3ba8b076
|
Display unread post count for conversations in inbox, if appropriate.
|
2011-07-27 22:33:13 +02:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
7b572bf40b
|
don't display connect to services unless services are configured on that pod
|
2011-07-27 00:11:24 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
73f9627338
|
moved invite people to the top
|
2011-07-26 23:31:42 -07:00 |
|
Andrej Kacian
|
77a654ef47
|
Updated copyright year in new file
|
2011-07-26 19:11:02 +02:00 |
|
Andrej Kacian
|
2dd09cfaa2
|
Updated to fit current upstream master
|
2011-07-26 19:11:02 +02:00 |
|
Andrej Kacian
|
658e836f4c
|
Make the "No tags" string translatable
|
2011-07-25 23:09:53 +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
|
56cdb7a3ad
|
Fix translation reference
|
2011-07-22 18:10:34 -07:00 |
|
Raphael Sofaer
|
241999f72a
|
MS RS translated reshares
|
2011-07-22 17:58:52 -07:00 |
|
Raphael Sofaer
|
00885be738
|
Provide feedback when a user tries to double-reshare
|
2011-07-22 17:43:05 -07:00 |
|
Raphael Sofaer
|
99aafb18cd
|
Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice
|
2011-07-22 17:13:31 -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 |
|
Raphael Sofaer
|
e19fb6d0f8
|
Use authority instead of host in order to get the port as well.
|
2011-07-21 18:23:33 -07: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 |
|