MrZYX
|
6400dc244f
|
fixing again. it's getting anoying
|
2010-11-12 06:06:16 +01:00 |
|
MrZYX
|
8085a7bcd7
|
fixes to be in sync with latest commits
|
2010-11-12 06:06:15 +01:00 |
|
MrZYX
|
d91c26fb68
|
translated getting started, fixed #508
|
2010-11-12 06:06:15 +01:00 |
|
MrZYX
|
381c53b775
|
found some untranslatable strings
|
2010-11-12 06:04:05 +01:00 |
|
MrZYX
|
eef0901f36
|
unscoped fill_me_out
|
2010-11-12 06:04:05 +01:00 |
|
MrZYX
|
ca72bb40a6
|
refactored en.yml
removed unused keys out of en.yml
replaced some ' with "
|
2010-11-12 06:04:05 +01:00 |
|
danielvincent
|
85e2316280
|
Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect
|
2010-11-11 19:41:12 -08:00 |
|
Raphael
|
d62a7c4ce2
|
Fix request views, refactor identical forms into partial.
|
2010-11-10 20:12:09 -08:00 |
|
Raphael
|
8232a92ca0
|
Update _person and person show, add specs for those pages
|
2010-11-10 12:41:18 -08:00 |
|
Sarah Mei
|
a39bd2badb
|
AspectsController#manage now works if you have pending friend requests.
|
2010-11-10 12:05:28 -07:00 |
|
Sarah Mei
|
ca9331970a
|
Renaming image_picker to image-picker since js likes dashes better than underscores
|
2010-11-10 10:52:33 -07:00 |
|
maxwell
|
71da954a76
|
removing deletetion
|
2010-11-09 15:29:43 -08:00 |
|
maxwell
|
f7cc01ceb2
|
more work done. much more to go
|
2010-11-09 15:29:43 -08:00 |
|
maxwell
|
034d7ee2b1
|
first commit
|
2010-11-09 15:29:43 -08:00 |
|
Raphael
|
390fffdee6
|
Fix new request view
|
2010-11-09 15:03:56 -08:00 |
|
Raphael
|
6dd58fe875
|
Specs pass again, invitations moved to Invitation model, refactor possibly complete
|
2010-11-09 14:07:26 -08:00 |
|
Raphael
|
71ab919ad3
|
Remove urls from requests, invitations are broken
|
2010-11-09 14:07:26 -08:00 |
|
maxwell
|
18505bf23c
|
resubmmiting object path bug. not sure how it got overwritten
|
2010-11-09 00:24:27 -08:00 |
|
maxwell
|
56c152ac6a
|
fixed a bug in the stream partial to use object_path
|
2010-11-08 21:16:46 -08:00 |
|
zhitomirskiyi
|
77fe7a1462
|
Revert "IZ local comment destroy"
This reverts commit cb9fb0ad94.
|
2010-11-08 19:32:43 -08:00 |
|
zhitomirskiyi
|
34179d60db
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-08 18:21:02 -08:00 |
|
zhitomirskiyi
|
cb9fb0ad94
|
IZ local comment destroy
|
2010-11-08 18:19:55 -08:00 |
|
maxwell
|
091d98ea15
|
invite friends actually calls up the invite friends pane on all aspects
|
2010-11-08 18:00:36 -08:00 |
|
maxwell
|
a84f9437b0
|
trying another thing to get the redirect working
|
2010-11-08 17:43:59 -08:00 |
|
maxwell
|
2162a2e3f9
|
collapse person's photos and status message into their profile; also, made these nested on a person
|
2010-11-08 15:55:58 -08:00 |
|
maxwell
|
7e40558dc4
|
reverse the years as they are displyed in the birthday dropdown
|
2010-11-08 10:33:05 -08:00 |
|
maxwell
|
80c8451bf2
|
fixing translation text of services page
|
2010-11-08 10:25:11 -08:00 |
|
maxwell
|
0d26348e69
|
remove arnold from the inviter mail form
|
2010-11-08 10:05:34 -08:00 |
|
danielvincent
|
58ce81f674
|
Add a person to aspect contains a searchable list as opposed to a dropdown.
|
2010-11-07 12:20:33 -08:00 |
|
danielvincent
|
0127c9eb6f
|
people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif
|
2010-11-07 11:07:37 -08:00 |
|
danielvincent
|
a4df6a8a53
|
bugfix in peeople#_person partial displaying relationship status
|
2010-11-07 10:51:33 -08:00 |
|
danielvincent
|
f594fa1d80
|
Stream is its own partial, which takes a collection of posts
|
2010-11-07 10:38:00 -08:00 |
|
Sarah Mei
|
32d953f457
|
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
|
2010-11-06 16:50:07 -07:00 |
|
maxwell
|
a971985884
|
removed private info if you are not friends
|
2010-11-06 16:34:41 -07:00 |
|
danielvincent
|
020cd90341
|
aspect labels on people#show view
|
2010-11-06 11:09:11 -07:00 |
|
danielvincent
|
ecfcc96f8e
|
Post a message to aspect dialog will only display if people are present.
|
2010-11-05 21:14:00 -07:00 |
|
danielvincent
|
ddb4b2b6ee
|
Clicking 'make public' label on everyone publisher selects respective checkbox
|
2010-11-05 17:49:15 -07:00 |
|
maxwell
|
32ed7e3b0f
|
forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have
|
2010-11-05 17:48:33 -07:00 |
|
maxwell
|
1a642e044a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-05 17:43:30 -07:00 |
|
danielvincent
|
1a481d43d2
|
Use _stream_element.haml as a wrapper for posts in the stream.
|
2010-11-05 17:40:28 -07:00 |
|
maxwell
|
4a39d1a516
|
date now has a default nil value
|
2010-11-05 17:38:51 -07:00 |
|
danielvincent
|
9a055b6cba
|
Photo partial now has a description and a link to view all photos by that person.
|
2010-11-05 17:27:36 -07:00 |
|
maxwell
|
4300b20c34
|
cleaned up profile page a bit more
|
2010-11-05 14:28:39 -07:00 |
|
danielvincent
|
bd9aa90278
|
User receives notification on new comment on post on any page.
|
2010-11-05 14:18:22 -07:00 |
|
Raphael
|
4233e45bc5
|
Adjust wording
|
2010-11-05 11:23:21 -07:00 |
|
maxwell
|
997f9ad8d0
|
making profile not look so bad
|
2010-11-05 00:54:09 -07:00 |
|
Sarah Mei
|
a230763879
|
gender is a text field
|
2010-11-04 22:02:27 -07:00 |
|
Raphael
|
1bba4c60f7
|
Merge remote branch 'MrZYX/untranslated-strings'
Conflicts:
app/views/aspects/manage.html.haml
config/locales/diaspora/en.yml
|
2010-11-04 20:05:57 -07:00 |
|
Derrick Camerino
|
087f7e90d4
|
removing aspect in ui only if ok is clicked on confirmation
|
2010-11-04 19:54:11 -07:00 |
|
Raphael
|
abebd18c98
|
Move getting_started self link color to a css class
|
2010-11-04 19:29:15 -07:00 |
|