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
Raphael
2ad74d397c
fix build
2010-11-13 19:05:12 -08:00
danielvincent
60b272b243
remove validations on url for now to support ip addresses in pod_url field in app_config.yml
2010-11-13 14:55:40 -08:00
danielvincent
969c668518
translation fix on _person.haml. button tweak
2010-11-13 12:10:09 -08:00
Hexagon
958be06ff1
Removed duplicate id generation in _new_comment form
2010-11-13 13:54:48 +01:00
danielvincent
988e2afe3d
resolved missing translation, tweaked button css, commented out mobile_fu in application controller
2010-11-13 00:26:55 -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
Raphael
1a5aa02c77
Removing :value => on hidden_field_tag. Thanks npouillard.
2010-11-12 14:10:49 -08:00
Raphael
1e842f1a88
Render mail css as a partial, fix spec
2010-11-12 12:26:34 -08:00
Raphael
ae9f4ab969
Refactor mail views, add a spec to make sure CSS is rendered
2010-11-12 11:47:59 -08:00
Raphael
0e8b1efefd
Merge remote branch 'MrZYX/en.yml-refactor'
2010-11-12 11:28:05 -08:00
danielvincent
716a77f0cc
fixing a refactor that broke friend requesting from the ui
2010-11-11 21:26:40 -08:00
MrZYX
5ae4248b30
some more fixes I overlooked. Sorry
2010-11-12 06:07:37 +01:00
MrZYX
f55a973685
two small fixes
2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0
just found the mailer... :)
2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1
found some still untranslatable strings in helpers and stuff
2010-11-12 06:07:36 +01:00
MrZYX
748efb1860
eliminated senseless duplicates in en.yml
2010-11-12 06:07:36 +01:00
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
4818973643
Beginning to refactor invitations into an Invitation class
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
7d6be51cfb
making photos#show be in no aspect
2010-11-08 17:53:47 -08:00
maxwell
a84f9437b0
trying another thing to get the redirect working
2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90
trying another thing to get the redirect working
2010-11-08 16:30:46 -08:00
maxwell
52908cec1a
services controller should now go back to the referer. this might not actually work
2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:56:18 -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
Raphael
70af10ee62
user#friends is now a many-foreign_key assoc, rather than a many-in
2010-11-08 15:19:23 -08:00
zhitomirskiyi
cbabc547a2
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032
the profile cannot massassign diaspora handle
2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c
MS RS fixed photo show bug
2010-11-08 14:05:01 -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
Raphael
8023b6f344
Check for birthday before putting in birthday paramaters
2010-11-05 18:32:18 -07:00
danielvincent
58c3a4306f
fixed the build
2010-11-05 18:16:28 -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
e4f8f558a0
aspects now have a max length of 20 characters
2010-11-05 17:18:20 -07:00
maxwell
4300b20c34
cleaned up profile page a bit more
2010-11-05 14:28:39 -07:00
danielvincent
3ed10a22ff
xml_accessor creates attr_accessors in addition to xml_readers
2010-11-05 14:25:45 -07:00
Raphael
6468f0003b
Take out some xml accessors
2010-11-05 14:24:56 -07:00
danielvincent
bd9aa90278
User receives notification on new comment on post on any page.
2010-11-05 14:18:22 -07:00
Raphael
9970ee0e22
Write comments controller spec
2010-11-05 14:15:40 -07:00
maxwell
cc92f61583
mailer queue now works
2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04
more testing
2010-11-05 11:46:43 -07:00
maxwell
53b25728ce
yay for typo
2010-11-05 11:46:43 -07:00
maxwell
4154cec28a
made mailer query based on ids, rather than making them serialize ruby objects
2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7
inital commit for mailqueue
2010-11-05 11:46:43 -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
c816a1f78e
RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered.
...
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
2010-11-04 22:51:30 -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
Raphael
c1c631d5ed
Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-04 18:56:43 -07:00
Raphael
4eba0595f9
Fix 328 profile images dying, thanks to theBernd
2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -07:00
danielvincent
be916384a1
collapsed remove from aspect and remove person into one function on aspects#manage
2010-11-04 17:50:48 -07:00
