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
984eef25be
UsersHelper -> GettingStartedHelper
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
d51e495925
fetch featured users from remote servers on app init unless already in the db
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
62f10c5b3c
add help
2011-08-03 17:25:04 -07:00
Maxwell Salzberg
7e8f17cc31
refactoring this stuff
2011-08-03 16:58:55 -07:00
Raphael Sofaer
1aac60bee3
Make sure that not deleting the service_users doesn't leave them stale
2011-08-03 15:39:23 -07:00
Raphael Sofaer
7d0c796762
Make sure that related data for fb users is attached to them
2011-08-03 15:30:58 -07:00
Raphael Sofaer
4d786d687c
Forget about postgres for now, depend on On duplicate key update
2011-08-03 14:39:38 -07:00
Raphael Sofaer
a8104da482
Strip exif in the scaling process
2011-08-03 14:34:54 -07:00
Raphael Sofaer
0fff54e074
We pass in nil as a size to person_image_tag, so we need to default it more forcibly.
2011-08-03 13:45:45 -07:00
Raphael Sofaer
67123a277c
Fix and simplify likes_container
2011-08-03 11:20:06 -07:00
Raphael Sofaer
5967f01dab
Take out PostsFake, now that we ajax in comments it's not worth the extra complications
2011-08-03 11:09:21 -07:00
Maxwell Salzberg
9cbb6c4d5e
you know, i should uncomment code before i commit it
2011-08-02 22:30:24 -07:00
Maxwell Salzberg
11ad3f2b78
silly hack to preventdefault tags from getting generated...
2011-08-02 22:28:40 -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
674ca883e5
Put class back into remote person_links
2011-08-01 18:25:31 -07:00
Raphael Sofaer
a469f09c01
Fix hovercard conflict with vanity urls
2011-08-01 18:22:29 -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
Raphael Sofaer
983d4e5598
Hopefully make youtube_titles a little less ridiculous
2011-08-01 12:30:21 -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
Gonzalo Rodriguez
3eb6d13f95
Issue #1431 : Suggest when the first letter typed, not the third
2011-07-30 15:56:28 -03:00
Maxwell Salzberg
bb8db654d6
add basic pod error logging, and added guard and removed autotest
2011-07-30 11:44:27 -07:00
Maxwell Salzberg
bbf8f2a15b
for tests, only try to connect with an actual person
2011-07-29 21:52:46 -07: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
Maxwell Salzberg
315ec29af2
typo in my link
2011-07-29 19:30:12 -07:00
danielgrippi
9037748d23
fixed search
2011-07-29 19:21:18 -07:00
danielgrippi
905a982d35
add two more default aspects for new users
2011-07-29 19:21:18 -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
d55a21c458
just kidding. totally going to namespace users
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
d407be036e
i am not a number! include username in the main url of a local user!
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
540a3e68a6
remove an unused query, randomize the contacts on your home page
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
73616a3e7a
new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about)
2011-07-29 17:20:10 -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
Raphael Sofaer
b8df1dca5c
remove pretty print
2011-07-29 14:56:06 -07:00
danielgrippi
e345f2dcbc
fix contacts index page
2011-07-29 14:15:28 -07:00
danielgrippi
2b550906fc
downcase query string for search
2011-07-29 14:05:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
16bd3e4c2f
less delay on search; start on 2 chars instead of 3
2011-07-29 12:26:04 -07:00
danielgrippi
f560321626
optimized people search
2011-07-29 12:04:10 -07:00
Raphael Sofaer
5e39368414
Get rid of 500 on mobile comment creation
2011-07-29 12:01:35 -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
cb828ae9d4
Merge branch 'master' of git://github.com/diaspora/diaspora into highlight-unread-conversations
2011-07-27 22:50:59 +02:00
MrZYX
99751af5a8
let the direction_for helper return ltr instead of nothing for ltr text, this should fix #1668
2011-07-27 22:34:41 +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
maxwell
7a5852e73a
fix a bug with openssl keys in development. note to future max and
...
rafi. never monkey patch anything on the top of a completely random
model. never again. ever.
TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
2011-07-24 20:06:07 -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