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 |
|
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 |
|