danielvincent
|
c841a47a37
|
status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE.
|
2010-11-21 23:42:49 -08:00 |
|
maxwell
|
60dd2f8e60
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-21 23:03:21 -08:00 |
|
danielvincent
|
55952d00c0
|
fixed failing photoscontroller spec.
|
2010-11-21 22:58:24 -08:00 |
|
maxwell
|
ce1768d0d3
|
fixing dropdown, and removing margin on publisher
|
2010-11-21 22:58:01 -08:00 |
|
danielvincent
|
8df864dec1
|
everyone -> 'all contacts' on home page. removed repeated user links.
|
2010-11-21 22:37:22 -08:00 |
|
Sarah Mei
|
218aa1c0d6
|
MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent
|
2010-11-21 19:56:35 -08:00 |
|
danielvincent
|
752d50a6a9
|
editing captions on photos uses remote forms. removed photo in album from WSR.
|
2010-11-21 19:51:20 -08:00 |
|
maxwell
|
c4a270ef8b
|
putting mobile interface back in so we can get it cleaned up
|
2010-11-21 17:14:43 -08:00 |
|
danielvincent
|
069b372c19
|
photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http.
|
2010-11-21 16:30:47 -08:00 |
|
danielvincent
|
bd0c21a634
|
button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.
|
2010-11-21 16:30:46 -08:00 |
|
danielvincent
|
d16a4601c2
|
contact list on aspect#show is ajaxy
|
2010-11-21 16:30:46 -08:00 |
|
danielvincent
|
b3ec4d10c2
|
user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.
|
2010-11-21 16:30:45 -08:00 |
|
maxwell
|
4742f61925
|
made the rss button a link to the feed, and aligned correctly
|
2010-11-21 16:13:03 -08:00 |
|
danielvincent
|
a9a91c436a
|
user menu is a button. fixed remove aspect button on aspect#show
|
2010-11-21 16:13:03 -08:00 |
|
maxwell
|
4ce337bbed
|
display a users username in the final step
|
2010-11-21 16:13:02 -08:00 |
|
maxwell
|
9f5ba1a1ea
|
added finished state to sidbar for getting started
|
2010-11-21 16:13:02 -08:00 |
|
danielvincent
|
6e603bf2af
|
aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts.
|
2010-11-21 16:13:02 -08:00 |
|
maxwell
|
39f596462e
|
saying sent on requests via js
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
769c0e1055
|
DG MS trying to finish statusmessage refactor
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
ea7bdfde28
|
fix validation and order of status message sent
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
9b7d2ed0f6
|
DG MS; status messages can now have photos.
|
2010-11-21 16:13:01 -08:00 |
|
maxwell
|
7f97b6f812
|
MS DG form now works reasonably well. still need to limit number of photos
|
2010-11-21 16:13:00 -08:00 |
|
maxwell
|
fb0dc2db7e
|
added photos to status messages
|
2010-11-21 16:13:00 -08:00 |
|
danielvincent
|
f6491816a3
|
adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing.
|
2010-11-21 16:13:00 -08:00 |
|
maxwell
|
9471f01040
|
making photo uploader work better
|
2010-11-21 16:11:55 -08:00 |
|
maxwell
|
6fb1479d0d
|
fixed publisher...whoops
|
2010-11-21 16:11:55 -08:00 |
|
maxwell
|
7fb751b00c
|
making photo uploader work better
|
2010-11-21 16:11:55 -08:00 |
|
danielvincent
|
242d0ab9c5
|
a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.
|
2010-11-21 16:11:55 -08:00 |
|
danielvincent
|
52cde14221
|
more touchups
|
2010-11-21 16:11:54 -08:00 |
|
danielvincent
|
2b54d9a0c5
|
adjusting more page structure. drafting about there.
|
2010-11-21 16:10:54 -08:00 |
|
danielvincent
|
7a259d6d53
|
drafted a basic structure
|
2010-11-21 16:09:27 -08:00 |
|
Raphael
|
6f0d008914
|
Move WebSocketReceiver out to a js file
|
2010-11-21 16:14:36 -05:00 |
|
Raphael
|
bf8190dbd5
|
Refactoring websocket JS
|
2010-11-21 15:38:24 -05:00 |
|
Raphael
|
53d3ac92a2
|
Fix WS JS
|
2010-11-21 14:26:07 -05:00 |
|
Raphael
|
4ce2de55e2
|
Fix photo show, js on people search page
|
2010-11-21 13:29:50 -05:00 |
|
Raphael
|
7db1da935a
|
Stream is a class
|
2010-11-21 13:21:42 -05:00 |
|
MrZYX
|
6f5c3f3258
|
made recent changes translatable and cleanup up en.yml a bit
|
2010-11-19 17:25:45 +01:00 |
|
Jonne Hass
|
f426c08dcc
|
made shared/_contatct_list.html.haml
and the type after "viewing:" in shared/_author_info.html.haml translatable
|
2010-11-19 17:25:05 +01:00 |
|
MrZYX
|
7200c007e5
|
made file uploader translatable
|
2010-11-19 15:25:14 +01:00 |
|
maxwell
|
466120cd58
|
fixing extra =
|
2010-11-18 20:07:57 -08:00 |
|
Raphael
|
655e92ebdd
|
Add some scopes for Request, take putses out of specs
|
2010-11-18 18:04:29 -08:00 |
|
Raphael
|
bad76d8cef
|
Use pod url in host-meta
|
2010-11-18 17:02:13 -08:00 |
|
zhitomirskiyi
|
d0d261fdae
|
zero default invites, the rake task starts people with 5 invites
|
2010-11-18 16:23:35 -08:00 |
|
Raphael
|
6841ffbecc
|
Disable_with on comment form
|
2010-11-18 15:41:51 -08:00 |
|
Raphael
|
c7b8c185bd
|
Disable with on publisher form
|
2010-11-18 15:41:51 -08:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
zhitomirskiyi
|
c8c0b5c8a2
|
made the service image the same size
|
2010-11-18 15:22:14 -08:00 |
|
maxwell
|
970d56a007
|
basic batch inviter
|
2010-11-18 15:17:22 -08:00 |
|
zhitomirskiyi
|
f95fd33ed4
|
typo
|
2010-11-18 12:22:39 -08:00 |
|
zhitomirskiyi
|
9a31d15c92
|
added icons for the connected services and to indicate the rss feed
|
2010-11-18 12:19:58 -08:00 |
|
Raphael
|
c564d2819e
|
Fixing no contacts link in _no_contacts. Thanks to alepane21.
|
2010-11-18 11:55:03 -08:00 |
|
Raphael
|
589c36d1ed
|
Merge remote branch 'hex/duplicate-ids'
|
2010-11-18 11:39:03 -08:00 |
|
Matt Baker
|
b2e6caafed
|
Don't show skip link if user.getting_started == false
|
2010-11-18 11:16:18 -08:00 |
|
maxwell
|
597258615b
|
adding star back to title
|
2010-11-18 11:06:17 -08:00 |
|
maxwell
|
9882fa183d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 23:19:27 -08:00 |
|
maxwell
|
2ffd2d93e3
|
made mailchimp form ssl
|
2010-11-17 23:19:12 -08:00 |
|
Sarah Mei
|
d1a745c9cd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:42:04 -08:00 |
|
danielvincent
|
eda346e283
|
use google's jquery within current protocol (http/https)
|
2010-11-17 22:36:01 -08:00 |
|
Sarah Mei
|
64237534fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:31:21 -08:00 |
|
Sarah Mei
|
c19ebcece3
|
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
|
2010-11-17 22:28:24 -08:00 |
|
maxwell
|
5e375a30d8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:06:08 -08:00 |
|
maxwell
|
c6778b942f
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/layouts/application.html.haml
|
2010-11-17 21:57:48 -08:00 |
|
danielvincent
|
558c175c2b
|
resolved translation issue in diaspora.en in user dropdown. second login link on landing page works.
|
2010-11-17 21:57:27 -08:00 |
|
maxwell
|
31d33054ef
|
added jammit, now js and css compress for production
|
2010-11-17 21:51:59 -08:00 |
|
danielvincent
|
9041a81fea
|
cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing
|
2010-11-17 21:21:00 -08:00 |
|
danielvincent
|
1a9041a3c0
|
DG MS; fixed cucumber tests to work with new landing page flow
|
2010-11-17 19:49:01 -08:00 |
|
danielvincent
|
056dc7d3ba
|
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
|
2010-11-17 19:37:08 -08:00 |
|
danielvincent
|
a7c1733093
|
firefox fixes and added links to press articles on landing page
|
2010-11-17 19:37:08 -08:00 |
|
danielvincent
|
f59f6be4b0
|
users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.
|
2010-11-17 19:37:08 -08:00 |
|
Raphael
|
37a694ed1f
|
Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects
|
2010-11-17 18:49:03 -08:00 |
|
maxwell
|
1a279de573
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 16:18:07 -08:00 |
|
maxwell
|
f442c6fe3e
|
taking out the if true
|
2010-11-17 16:17:52 -08:00 |
|
Raphael
|
5e269edb5a
|
Adding logging to webfinger in people_controller
|
2010-11-17 15:56:39 -08:00 |
|
Raphael
|
2ecf1e8b71
|
No name fields on invitation accept
|
2010-11-17 15:45:40 -08:00 |
|
Raphael
|
4853a55d9b
|
Don't expect raises from user receive
|
2010-11-17 15:35:25 -08:00 |
|
Raphael
|
6c97899d5d
|
Add logging statements, rescue callbacks in em-webfinger
|
2010-11-17 13:55:58 -08:00 |
|
maxwell
|
045c8f1aac
|
updated magent, now using my fork untill bugfix gets pulled
|
2010-11-17 13:49:12 -08:00 |
|
maxwell
|
e959e529ff
|
ga looks like it only likes if the code is pasted...hrmpf
|
2010-11-17 12:29:58 -08:00 |
|
maxwell
|
ba620e5400
|
spell vendor correctly
|
2010-11-17 12:25:09 -08:00 |
|
maxwell
|
643950cf52
|
added google a
|
2010-11-17 12:16:44 -08:00 |
|
maxwell
|
5561ab9cec
|
adding get satisfaction
|
2010-11-17 12:08:06 -08:00 |
|
maxwell
|
afc3bd63fe
|
added button to end of getting started
|
2010-11-17 11:30:22 -08:00 |
|
maxwell
|
6a695479f7
|
adding updated jquery UI for compatability
|
2010-11-16 23:58:16 -08:00 |
|
maxwell
|
f55509085a
|
upgraded jquery, and deleted a second version of both jqueries
|
2010-11-16 21:41:20 -08:00 |
|
maxwell
|
092f0ef7a8
|
invite link when you get a webfinger error
|
2010-11-16 19:07:19 -08:00 |
|
Raphael
|
ece1dc2cf9
|
In progress invites in _manage_aspect_contacts
|
2010-11-16 18:10:15 -08:00 |
|
Raphael
|
e2412d2e43
|
Add error messages for friending from aspect-manage
|
2010-11-16 18:00:55 -08:00 |
|
Raphael
|
c0414b8184
|
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
7876da8fb8
|
Refactor raises in requesting to validations in request, move to better controller structure
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
d1a56e9ef2
|
Fix to websocket js
|
2010-11-16 14:35:46 -08:00 |
|
Alec Leamas
|
90b86690d9
|
Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4
|
2010-11-16 16:25:32 +01:00 |
|
Sarah Mei
|
44bd4534ce
|
I found where we needed the one-line addition. Ruby 1.9 build now works.
I feel pretty badass.
|
2010-11-15 22:44:55 -08:00 |
|
Raphael
|
248e768846
|
search now sockets a person
|
2010-11-15 19:13:45 -08:00 |
|
zhitomirskiyi
|
c5ae73f96d
|
websocket secure params in app_config
|
2010-11-15 17:45:52 -08:00 |
|
Raphael
|
1b39b79446
|
Make invitation view with no inviters sensible
|
2010-11-15 16:35:00 -08:00 |
|
Hexagon
|
35095f8859
|
Update of sv.yml to reflect latest changes + small fix to en.yml
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
9f8ef8ae3b
|
Translation fix "Invite someone"
|
2010-11-15 22:28:36 +01:00 |
|
Raphael
|
0f1517af15
|
Redirect directly to the login page no registrations closed
|
2010-11-15 12:24:58 -08:00 |
|
Raphael
|
d3098cf6bc
|
Add option to close registration in app_config
|
2010-11-15 12:15:40 -08:00 |
|
Raphael
|
03eea3fc08
|
Class not class_name
|
2010-11-15 11:49:16 -08:00 |
|