Raphael
2e87bece60
Final fixes for person socketing
2010-12-02 19:03:15 -08:00
maxwell
7f5dc14726
fix dup comment showing with comments with more than three, also fixed veribage
2010-12-02 15:18:54 -08:00
MrZYX
c3356af8d1
mardownify doesn't strip _/__/*/** without context anymore and allow __/** to be escaped with \__/\** instead of \_\_/\*\*. probably makes it less robust against weired constructs though
2010-12-02 13:54:39 +01:00
Sarah Mei
a09f299cfa
Revert "Added translation scaffold for inflection of nouns by grammatical gender in some languages."
...
This reverts commit 65c796572d
2010-12-01 22:29:32 -08:00
Sarah Mei
967fcd9a52
Revert "Added genderized variants of t() to views, controllers and helpers."
...
This reverts commit 017251fef9
2010-12-01 22:29:24 -08:00
maxwell
e18b918676
MS DG only show three comments by default
2010-12-01 18:09:41 -08:00
Paweł Wilk
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +01:00
Paweł Wilk
65c796572d
Added translation scaffold for inflection of nouns by grammatical gender in some languages.
2010-12-01 17:29:04 +01:00
Paweł Wilk
279b08ae4a
Added inflection of nouns by the grammatical gender for some languages.
...
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
2010-12-01 17:29:04 +01:00
danielvincent
601284a171
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
2010-11-30 15:58:26 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
danielvincent
fa66162de5
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/helpers/application_helper.rb
app/views/comments/_comment.html.haml
app/views/people/_person.html.haml
app/views/shared/_stream_element.html.haml
2010-11-30 13:19:17 -08:00
Raphael
f44b02e22c
Clean up people/person
2010-11-30 13:07:02 -08:00
Raphael
93bbfd19d2
Move back to image link helper, but static
2010-11-30 13:07:02 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Raphael
49e8347aa3
Use static helper for aspect links
2010-11-30 12:23:43 -08:00
Raphael
fce428826c
Try to take photos query out of views
2010-11-29 23:41:03 -08:00
Raphael
03e3c3a202
Render comment partial with collection option
2010-11-29 17:50:30 -08:00
Hexagon
b0ff8f0f60
Mini refactor, removed terse_url function
2010-11-29 23:23:51 +01:00
maxwell
e0efaa6317
made the checking for already connected more explicit. also, the check itself had a bug when we were calling self.to_id on a request, rather than self.to.id
2010-11-29 10:57:54 -08:00
Raphael
845e1fe7a3
Fix comments ajax response
2010-11-28 01:31:05 -05:00
Raphael
7ca124c002
Refactor views to not be so dumb.
2010-11-27 21:27:27 -05:00
Raphael
49f4ec1432
comment ids in the logs
2010-11-27 16:21:40 -05:00
danielvincent
a932547d12
minimizing some queries in the views. only select aspect names and ids in application controller.
2010-11-27 01:05:55 -05:00
Raphael
d5d4a08f03
Start moving youtube title getting into the post/comment flow
2010-11-27 01:00:47 -05:00
Raphael
3a24eb900d
Refine log lines
2010-11-26 13:02:52 -05:00
MrZYX
6e5b097f81
try at fixing a translation
2010-11-26 18:33:52 +01:00
MrZYX
e916e33482
pulled and merged request 509, thanks siefca
2010-11-26 15:48:08 +01:00
Dan Hansen & Sarah Mei
5075a7384b
allow hyphens in YouTube video IDs
2010-11-25 21:05:54 -08:00
Raphael
690951dcd1
Take a query out of the views
2010-11-25 23:53:45 -05:00
danielvincent
7c6d5b8d27
cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating.
2010-11-25 23:14:45 -05:00
danielvincent
b56af997cb
comment streams rendered expanded/collapsed initially by server.
2010-11-25 20:23:33 -05:00
Dan Hansen & Sarah Mei
e78a86897a
Video links now use data attributes and render in an iframe
2010-11-25 16:07:39 -08:00
Sarah Mei
ef2fa21d06
person_image_link and object_path return empty strings if parameter is nil.
2010-11-25 12:26:46 -08:00
danielvincent
d7609ef647
fixed issue with photos#index not recognizing an already sent request.
2010-11-23 21:03:35 -08:00
danielvincent
0b36e955fe
check if profile exists before fetching profile photo
2010-11-23 14:49:32 -08:00
danielvincent
c9c84794af
fixed build. publisher lights up on hover on aspect#index page. updated login page text.
2010-11-23 03:10:47 -08:00
danielvincent
c63319f127
aspect#show cleanup. added 3 icons.
2010-11-22 17:03:33 -08:00
danielvincent
0e7b1f5eb7
status messages and comments made by user will ajax onto the current page, and websocket everywhere else.
2010-11-22 14:52:13 -08:00
MrZYX
e72f4e1da7
translatable status is good again
...
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
danielvincent
8c6f3bddc3
added diaspora handle to home page with help text. added email address to account settings page.
2010-11-22 11:19:50 -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
d16a4601c2
contact list on aspect#show is ajaxy
2010-11-21 16:30:46 -08:00
maxwell
4ce337bbed
display a users username in the final step
2010-11-21 16:13:02 -08:00
maxwell
31d33054ef
added jammit, now js and css compress for production
2010-11-17 21:51:59 -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
248e768846
search now sockets a person
2010-11-15 19:13:45 -08:00
danielvincent
ed50fe7f1f
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
MrZYX
9ceb3e2fd1
found some still untranslatable strings in helpers and stuff
2010-11-12 06:07:36 +01:00
MrZYX
6400dc244f
fixing again. it's getting anoying
2010-11-12 06:06:16 +01:00
maxwell
034d7ee2b1
first commit
2010-11-09 15:29:43 -08:00
danielvincent
020cd90341
aspect labels on people#show view
2010-11-06 11:09:11 -07:00
danielvincent
58c3a4306f
fixed the build
2010-11-05 18:16:28 -07:00
danielvincent
1a481d43d2
Use _stream_element.haml as a wrapper for posts in the stream.
2010-11-05 17:40:28 -07:00
danielvincent
bd9aa90278
User receives notification on new comment on post on any page.
2010-11-05 14:18:22 -07:00
maxwell
997f9ad8d0
making profile not look so bad
2010-11-05 00:54:09 -07:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
Raphael
a9b429d163
Merge remote branch 'ed0h/helper-method-for-markdown'
2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4
Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"
...
This reverts commit 2b128d88ec8778bdab3b
2010-11-02 12:14:12 -07:00
Raphael
2b128d88ec
Merge remote branch 'ed0h/336-markdown-for-status-messages'
...
Conflicts:
pkg/ubuntu/dist
2010-11-02 11:45:16 -07:00
Alec Leamas
fceffba261
Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor
2010-11-02 16:34:47 +01:00
livefromthemoon@gmail.com
aab74cf1ff
Added markdown support for status messages
2010-11-02 03:55:14 +01:00
maxwell
3c8b40c427
IZ MS retractions now use diaspora handle
2010-11-01 17:11:06 -07:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
Hexagon
1acc206fa4
#475 : Fixed more untranslated strings
2010-11-01 22:22:13 +01:00
danielvincent
3f7955f978
removed two unused methods
2010-10-31 14:50:14 -07:00
livefromthemoon@gmail.com
bcb17aae16
Add support for markdown links
2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
ebf9dd464f
Better support for imbricated markdown emphasis
2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
112088ace3
add support for markdown emphasis in status messages
2010-10-30 19:26:11 +02:00
Raphael
d753e31205
Merge remote branch 'ed0h/309-user-choose-language'
...
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
2010-10-29 12:06:14 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05:17 -07:00
danielvincent
2b4e3e3a41
a person now has a photos#index page.
2010-10-29 10:38:17 -07:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
maxwell
de04e717c0
made image or default to help with hcard parsing, deleted old default user picture
2010-10-22 16:57:01 -07:00
danielvincent
e9ced7b2e6
changing photo now updates all user images in page
2010-10-20 12:35:16 -07:00
Raphael
296afdc871
Beat Dan at bugfixing
2010-10-19 11:43:10 -07:00
Raphael
9f653e39f1
Fix bug 376
2010-10-19 11:39:52 -07:00
Raphael
de0b240dbb
Remove unused helper method
2010-10-19 11:36:33 -07:00
danielvincent
7e9585c5f0
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
2010-10-19 11:29:29 -07:00
archi
1d9aa4c43d
Modified spec (doesn't check Youtube handling due to disabled net::http)
2010-10-17 21:07:49 +02:00
archi
f2af56f4b2
Youtubelink support :)
...
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
2010-10-17 20:18:24 +02:00
archi
f676e284f7
Added Youtube links - Still TODO: Caching of titles!
2010-10-17 16:14:01 +02:00
archi
8e753cc073
Youtube proof of concept patch/preview - not done yet (see bug #332 )
2010-10-17 12:56:26 +02:00
archi
035db98367
Added HTML links to posts
2010-10-17 02:06:46 +02:00
maxwell
13a2464484
adding a confirm link on the aspect remove button
2010-10-16 02:55:45 -07:00
maxwell
20f164fd45
fixing some of the invite copy
2010-10-15 11:11:25 -07:00
Raphael
3729431ccf
don't translate css class to mark request count
2010-10-08 14:46:57 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
ilya
52313b799b
added a warning, moved connected as into a partial, removed the
...
publishing box from settings page
2010-09-27 16:31:19 -07:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Raphael
d748d456b5
Revert "fix in person partial"
...
This reverts commit 8c0bc4b9e6
2010-09-23 16:21:08 -07:00
danielvincent
8c0bc4b9e6
fix in person partial
2010-09-23 10:49:35 -07:00
Raphael
2489f8503f
Merge branch 'master' into HEAD
...
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
2010-09-22 21:32:03 -07:00
ilya
efd901dcd9
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
2010-09-21 15:46:57 -07:00
Dorian
003a8b454f
Some refactoring again (define code rules would be good)
2010-09-22 02:55:54 +08:00
maxwell
e2fc48c9ff
MS being slightly more proper with application helper, and fixing the person search page
2010-09-20 16:44:35 -07:00
maxwell
cb0f0b72eb
MS removed a log and trying to be slightly more pedantic
2010-09-20 15:32:18 -07:00
danielvincent
14ad24ba7e
visual tweaks on header. moved upload a file button to header on album#show
2010-09-19 14:27:20 -07:00
Ariel Zavala
0014024870
Added I18n translations to helpers
2010-09-17 15:26:31 -04:00
danielvincent
cbb692b6a3
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -07:00
Raphael
0eb2c97aef
object_path shouldn't create links to users
2010-09-16 14:51:27 -07:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
da8ec589b7
RS, DG; display the correct tab on manage, change edit to manage
2010-09-14 10:05:59 -07:00
Daniel Vincent Grippi
a7c6e22e01
DG RS; passing around params[:aspect]. querying in application controller for current aspect.
2010-09-14 09:44:09 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
9837340eb2
Rename files from group to aspect
2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
Raphael
86d9a41d25
send_friend_request_to now takes a person and group, rather than a receive url and a group id
2010-09-09 16:06:42 -07:00
Raphael
00f8a3e628
removed ensure_bson in user. added to_id method to String and ObjectID classes
2010-08-25 17:11:57 -07:00
Raphael
55c94c385c
fixed photos going through the websocket. added a spec to SocketsController
2010-08-25 16:08:44 -07:00
Raphael
5ac5f58679
Tabs on the top aren't all selected on group select, some other view tweaks
2010-08-24 19:22:43 -07:00
Raphael
5779610659
messed with the views
2010-08-24 18:31:16 -07:00
Raphael
1faaf1dd81
Fix profile pic getting unset on profile update
2010-08-24 17:43:11 -07:00
Raphael
c102e81b03
put the visible back in
2010-08-24 16:56:04 -07:00
Raphael
db33d94f07
Render nothing on status_messages create, Websockets now honestly
...
support multiple groups.
2010-08-24 14:36:03 -07:00
Raphael
7ca9d1e791
Changed group_nav a little, deleted people_sidebar
2010-08-24 11:02:30 -07:00
danielvincent
37a67b29a4
left/right arrow keys on photo show page go to prev/next
2010-08-23 11:22:55 -07:00
Raphael
dc1dd07720
Don't crash on requesting a non-existent email address
2010-08-23 11:04:57 -07:00
maxwell
361adda6cd
added group picker. sends the right params, but posts only have one group right now so thats a bummer
2010-08-22 22:20:34 -07:00
ilya
643c52fd62
making a clear text on the user index page
2010-08-19 18:10:55 -07:00
maxwell
756278f498
MS added friend search, and allow for autodiscover
2010-08-19 12:37:34 -07:00
maxwell
84cc598017
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
2010-08-18 22:58:57 -07:00
ilya
284601c6b1
got moved photo.image.stuff to photo.url[:stuff]
2010-08-18 20:59:01 -07:00
ilya
3243435015
the album create doesn't crash the app
2010-08-18 20:14:31 -07:00
ilya
4019e4425a
Checking for failing to set url in photo
2010-08-18 17:12:28 -07:00
ilya
daf08cd9f9
DG IZ posts by the user get websocketed on the group page and albums
...
get signed?
2010-08-17 18:06:35 -07:00
ilya
f15b3c46b2
DG IZ; reverted to before removing latest message methods
2010-08-17 17:40:48 -07:00
ilya
e5036862f6
DG IZ removed the latest message javascript as well as the hash
2010-08-17 16:49:58 -07:00
ilya
7d68089c8b
DG IZ using group_id when passing the id around the app
2010-08-17 16:02:12 -07:00
ilya
87bc9dad1d
DG IZ added group id to the action hash
2010-08-17 15:27:12 -07:00
ilya
7316c6073c
DG IZ local person bug
2010-08-17 10:58:50 -07:00
Raphael
72559cbce1
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:37:18 -07:00
Raphael
50919ef491
Requesting now searches the local server by email for a matching person.
2010-08-17 10:37:09 -07:00
ilya
dea6551374
DG IZ; moved post() into User from Person.
2010-08-17 10:35:25 -07:00
Raphael
e2d5bf909f
Call right method in dev_utilities, clear junk out of comments helper
2010-08-16 12:45:31 -07:00
Raphael
b37b8303d3
Check for friending yourself in requests helper
2010-08-16 11:55:32 -07:00
Raphael
4c731bf818
special-casing local webfinger
2010-08-16 11:29:14 -07:00
Raphael
3efa36587a
Took out a bunch of user.owner references
2010-08-16 11:01:58 -07:00
Raphael
a9ebe44b1d
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-10 16:03:54 -07:00
Raphael
a8b77cf868
DG RS; made an instantiate method for user which makes a person and profile
2010-08-10 15:35:27 -07:00
maxwell
016c8fa471
MS IZ taking out URL options in sockets helper. hopefully the websocket doesnt blow up
2010-08-10 14:11:41 -07:00
maxwell
0ffe893f8a
MS IZ merging diffs
2010-08-10 12:37:04 -07:00
maxwell
71612ba33d
changing some webfinger resources
2010-08-10 12:36:00 -07:00
Raphael
9947a2abb8
RS, DG; latest_status thing now works, started putting signup back in
2010-08-10 12:26:43 -07:00
danielvincent
36adf1b6fd
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 21:10:31 -07:00
danielvincent
fd8d92a095
moved next/prev links in photo show to be inline with full size link.
2010-08-09 20:23:01 -07:00
maxwell
68c4de6c16
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 19:05:12 -07:00
maxwell
d443be35f9
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
...
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb
Going toward pending requests
2010-08-09 17:21:41 -07:00
Raphael
838fec4921
RS, DG; Working on group nav, fixed some stuff in photo
2010-08-09 16:34:06 -07:00
Raphael
59147eb232
Person.new in dev seed
2010-08-09 13:03:27 -07:00
Raphael
33a827c33a
RS, DG; Websocket is now working again, users have a channel
2010-08-09 13:02:08 -07:00
maxwell
7be374ac48
MS IZ fixed a couple of view things as well as the dev db seed script
2010-08-09 10:10:41 -07:00
ilya
890f927492
removed references of mine? method in all views
2010-08-08 22:53:23 -07:00
danielvincent
a6f5603dc9
added email field to login screen. strange error won't let me log in?
2010-08-06 23:55:05 -07:00
Raphael
4350e17656
RS, IZ; removed lots of putses, fixed up request, parser, retractions
2010-08-06 16:01:39 -07:00
Raphael
d130b82e42
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
2010-08-06 11:52:33 -07:00
maxwell
5d924dadf4
MS DG; 19 failing specs left
2010-08-05 17:16:51 -07:00
Raphael
58addca8dd
RS, IZ; extracted and murdered ostatus.
2010-08-04 16:00:01 -07:00
Raphael
d503c6541f
RS; posted statuses now use the websocket to update latest, time is now styled right
2010-08-02 11:13:21 -07:00
Raphael
c95ceecf9e
Clarified socket helper, added a selenium test
2010-07-30 12:40:02 -07:00
ilya
3eeb81ad34
DG IZ; time_created_at uses published_at instead of created_at for OstatusPost
2010-07-29 20:43:03 -07:00
ilya
f6495e2bec
RS IZ photos now fade in on the album upload page
2010-07-29 17:26:05 -07:00
maxwell
7a0db375ab
MS added rails 3rc
2010-07-29 09:59:03 -07:00
ilya
03cf61bd7c
new user top bar
2010-07-28 17:04:56 -07:00
ilya
9e3c6a0936
DG IZ; brushed up ostatus user page
2010-07-28 12:13:36 -07:00
maxwell
bdca2348a6
MS IZ profile page has more useful info, but ultimatly kinda ugly
2010-07-27 14:23:31 -07:00
danielvincent
ec59b89e83
DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page
2010-07-26 16:57:44 -07:00
maxwell
47f5c77e1a
kinda prettied up the albums page
2010-07-26 15:09:02 -07:00
Maxwell Salzberg
66f66b85a6
MS added test, things still seem broken though
2010-07-24 23:21:02 -07:00
danielvincent
03e06cb279
person sidebar has a view all; displays user images with names in tooltips instead of text
2010-07-24 10:24:43 -07:00
maxwell
9095a06738
MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok
2010-07-24 01:56:07 -07:00
danielvincent
e5d298040d
little things
2010-07-23 21:11:21 -07:00
ilya
283bbc4850
Switching to Grid_FS
2010-07-23 14:32:55 -07:00
Raphael
d8ebbf8d26
Adding some logging to requesting/subscribing
2010-07-23 14:20:02 -07:00
maxwell
e0baf9d6c5
MS sort the updates on a author's page
2010-07-22 23:36:37 -07:00
maxwell
7ba85e0d4e
MS tantek?
2010-07-22 22:22:08 -07:00
maxwell
8c50ea0c97
MS i really wanna subscribe to tantek
2010-07-22 22:14:06 -07:00
maxwell
0fdce91756
DG MS added views for ostatus following
2010-07-22 21:27:43 -07:00
maxwell
6869384732
i think it works - max
2010-07-21 21:15:16 -07:00
maxwell
21bd875a3f
MS DG request bar fix, and some other small tweaks
2010-07-21 16:38:33 -07:00
maxwell
6f7f82e818
added helpers for photo show page
2010-07-21 15:47:30 -07:00
maxwell
0f407b11ed
MS DG comments now work on photo show page; full size photos now available
2010-07-21 14:58:06 -07:00
maxwell
933bf61db8
RS, MS, relationship_flow returns the action and the url to execute it to
2010-07-20 16:15:36 -07:00
maxwell
5d0c5dbd86
MS kinda hacky webfinger email fix
2010-07-16 23:03:59 -07:00
danielvincent
180138610c
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-16 23:02:31 -07:00
danielvincent
04eb66b2e6
user has a image url field for user picture
2010-07-16 23:02:24 -07:00
maxwell
cd31d11aca
MS IZ adding a friend through the webfinger profile
2010-07-16 22:11:55 -07:00
maxwell
f34e033bce
MS IZ getting the profile
2010-07-16 21:59:40 -07:00
Raphael
501620e9fb
DG RS; fixed some visual bugs. request link now turns red on new request
2010-07-15 18:40:55 -07:00
maxwell
f97218c005
MS IZ cleanup of pubsub stuff
2010-07-15 10:24:41 -07:00
maxwell
1b63fbbec7
DG MS added pubsub gem, added hub to message queue
2010-07-14 11:01:28 -07:00
maxwell
902a8cb349
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
2010-07-10 10:34:46 -07:00
maxwell
e1834cc887
DG MS fixed spec
2010-07-08 20:51:12 -07:00
maxwell
06eec9204a
DG MS; person request is now request. refactoring as well. user verbiage for request actions
2010-07-08 18:28:39 -07:00
maxwell
db1811eb61
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
2010-07-08 14:14:03 -07:00
maxwell
6293f9f585
socket is now a controller
2010-07-08 10:17:41 -07:00
maxwell
58ed75a289
MS socket now works in the server, but I can't figure out how to mock this stuff
2010-07-07 22:20:15 -07:00
maxwell
a35892428c
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
2010-07-07 20:09:27 -07:00
maxwell
947f1a60e7
RS MS added url for for the socket controller
2010-07-07 18:59:32 -07:00
danielvincent
3d105e7c1e
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
2010-07-07 16:53:52 -07:00
maxwell
cc603a7943
autotest for rafi
2010-07-07 15:27:44 -07:00
danielvincent
c27bc09e75
fixed user image bug
2010-07-01 16:35:44 -07:00
danielvincent
c0a744b2ce
owner picture selector in application helper
2010-07-01 15:34:35 -07:00
maxwell
fcbe8e42a0
RS MS slightly less explosive end if you call real name on someone that doesn't have a profile
2010-06-29 20:54:53 -07:00
maxwell
36b5a90d34
MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works
2010-06-28 17:35:38 -07:00
ilya
25198a7e86
IZ, RS; Moved XML parser to lib
2010-06-28 15:56:46 -04:00
Maxwell Salzberg
2bbfcb0bb1
putting debug in for master so I can check deployed servers out
2010-06-26 14:16:19 -07:00
maxwell
6467f943da
MS^2 Comments serialize and deserialize properly
2010-06-25 22:49:53 -07:00
maxwell
e4e2d52bcb
reverting typos
2010-06-25 22:29:36 -07:00
maxwell
0d700046c4
MS^2 Object parser can handle comments
2010-06-25 22:29:08 -07:00
maxwell
ec01e2c016
Comments now working, but no AJAX, need to refresh to see them
2010-06-25 22:15:41 -07:00
maxwell
64c1d99b8c
MS found the stupid nil. from here, i have 33 failures.
2010-06-24 22:20:09 -07:00
ilya
81157190ac
RS, IZ, Merged from master
2010-06-23 20:19:25 -04:00
ilya
8829714e2d
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
2010-06-23 20:17:44 -04:00
maxwell
9fa26f020e
DG MS; clicking on a person's name redirects to that person's post stream
2010-06-23 14:32:51 -07:00
maxwell
663b99924f
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-06-23 01:26:06 -07:00
maxwell
60fa7e3ac4
view stuffs
2010-06-23 01:26:00 -07:00
Maxwell Salzberg
e6e1c22b07
DG; webhooks apply incoming posts to current friends with a silent fail on no match
2010-06-23 01:20:56 -07:00
maxwell
3064d208eb
added firefox websocket stuffs, only loads if it is not safari or chrome
2010-06-22 14:31:16 -07:00
maxwell
f696ffc3a6
fixed up some views, but some stuff feels like it broke
2010-06-21 16:46:19 -07:00
maxwell
a0417d13af
fixed merge with master
2010-06-21 14:38:38 -07:00
danielvincent
06271d5821
added dumb partial switcher function in dashboard controller
2010-06-21 14:23:59 -07:00
maxwell
655dd64a54
websockets work
2010-06-21 14:12:05 -07:00
maxwell
5286b6be69
DG MS; require XML root node; added header to XML (not yet required)
2010-06-18 18:03:13 -07:00
maxwell
34df8fa946
DG MS; resolved unknown types going to receive handler. only post objects are inputted
2010-06-18 16:47:34 -07:00
maxwell
c430aaff18
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
2010-06-18 14:35:51 -07:00
danielvincent
02137b9fb9
DG MS; receive hook working.
2010-06-17 18:29:56 -07:00
Raphael Sofaer
ed26c82be4
RS, IZ; merged day's commits
2010-06-15 21:41:39 -07:00
maxwell
9e89b2e0a7
DG MS did some basic work on the dashboard controller and some super basic fallback partial view
2010-06-15 21:08:29 -07:00
Raphael Sofaer
c4b931c309
IZ RS getting remote messages (not yet done)
2010-06-15 18:41:54 -07:00
danielvincent
45c926f790
DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs
2010-06-15 11:09:47 -07:00
danielvincent
d70cf5b7a7
DG RS; fixed newest messages bug in view. moved to helper.
2010-06-15 10:11:28 -07:00
maxwell
1a1887f77f
DG MS completed bookmark story
2010-06-14 20:20:19 -07:00
maxwell
960db53b9b
MS IZ DG completed crud for friend
2010-06-14 13:12:17 -07:00
maxwell
85e6eb2132
added stray local files
2010-06-13 21:22:52 -07:00
maxwell
e068707158
added nifty templates, and started a user model. session model is next
2010-06-12 15:26:37 -07:00
Raphael Sofaer
0390bbde8a
Activerecord this time\!
2010-06-11 10:40:49 -07:00
