Raphael
d44df7e977
put remove contact link under aspect membership
2010-12-13 16:40:05 -08:00
Raphael
02d76441e4
Merge branch 'aspect-list-on-profile'
2010-12-13 16:12:29 -08:00
Raphael
baa04ceac7
Add aspect list to contact page
2010-12-13 15:58:08 -08:00
maxwell
42c22cedf9
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-13 14:38:47 -08:00
maxwell
8eb9ab1781
making image names more generic
2010-12-13 14:02:11 -08:00
mblog
d0355fdd43
Feature #348 : Change Email
2010-12-13 22:14:52 +01:00
maxwell
4fe42044ac
removed homepage detail into a partial, which you should redefine
2010-12-13 12:52:08 -08:00
danielvincent
68a51448e5
comment link shows up again on contact pages
2010-12-13 10:19:04 -08:00
MrZYX
6cacfde6a6
two fixes to translations
2010-12-12 15:55:51 +01:00
danielvincent
2f2f8fef8a
delete/reshare only if current_user on stream_element
2010-12-12 01:41:54 -08:00
danielvincent
f7a7dff53b
allow for newlines in profile bio
2010-12-12 00:50:30 -08:00
danielvincent
52a3996ad0
textareas auto expand
2010-12-11 22:18:03 -08:00
Raphael
627561737c
Just get rid of some whitespace
2010-12-11 20:34:25 -08:00
danielvincent
b4170dc991
badges on stream elements. say 'all aspects' instead of listing out all user's aspect names
2010-12-11 20:28:40 -08:00
MrZYX
0d70f78a12
small translation fix
2010-12-11 22:03:06 +01:00
danielvincent
c9b498d59c
resolved 500 page on getting_started#step_3
2010-12-11 12:05:58 -08:00
danielvincent
fd2cbc1cf4
added invite link to search page
2010-12-10 18:28:51 -08:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -08:00
danielvincent
8de5c5babd
fixing request bar on aspects#manage
2010-12-10 10:12:30 -08:00
MrZYX
0374ee436e
fixed untranslatable strings
2010-12-10 16:52:35 +01:00
Alec Leamas
eacee54846
Replace APP_CONFIG[:terse_pod_url] with uri object.
...
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684 ,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se ;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
danielvincent
5731f32cfe
add correct page titles
2010-12-09 20:09:20 -08:00
maxwell
a4336a8e72
moar tests for services
2010-12-09 19:29:25 -08:00
Raphael
2be0666d80
Remove query from aspects manage, correct spec in User spec
2010-12-09 19:11:47 -08:00
Raphael
778c62e0b0
Use mail css partial
2010-12-09 19:11:47 -08:00
maxwell
3625a5f2f1
display a basic message for when nothing was searched for
2010-12-09 16:51:58 -08:00
maxwell
10ca0688f5
dont show get satisfaction unless you are on joindiaspora.com
2010-12-09 16:35:31 -08:00
maxwell
b54a72c240
Revert "Revert "fixed commenting bug on current user's profile page""
...
This reverts commit 166202d0b2
2010-12-09 13:57:43 -08:00
maxwell
166202d0b2
Revert "fixed commenting bug on current user's profile page"
...
This reverts commit 8264c58e3e
2010-12-09 13:53:23 -08:00
danielvincent
8264c58e3e
fixed commenting bug on current user's profile page
2010-12-09 13:42:11 -08:00
Raphael
3a4caca397
Fix photo uploading in profile photos, style photo upload button better
2010-12-09 13:06:31 -08:00
Raphael
b8589c457d
Refactor people edit page, now using form_tag
2010-12-09 13:03:30 -08:00
danielvincent
fa9caf00ca
added tooltip text to public icon
2010-12-08 19:07:08 -08:00
danielvincent
aa628c090d
highlight public posts in the stream
2010-12-08 18:59:02 -08:00
danielvincent
cdd225c076
don't show new comment form on a non-contact's post
2010-12-08 18:23:30 -08:00
danielvincent
faf27fe05a
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 17:06:39 -08:00
danielvincent
46793179db
people#show displays shows public posts for non-contacts as well
2010-12-08 16:53:24 -08:00
maxwell
10df61a504
order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page
2010-12-08 16:35:48 -08:00
maxwell
e4e3a7493c
fixed a bug where reshare text was truncated
2010-12-08 15:09:41 -08:00
maxwell
f659ba58ef
limit the new aspect form name to be less than 20 char in the form
2010-12-08 13:58:16 -08:00
Hexagon
5c1c31b2b2
Final fix, really
2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00
Putting document.ready back
2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5
Cleaning up revert of #619 pull
2010-12-07 22:20:26 +01:00
Raphael
18319f8e42
Hopefully cut down the stream rendering time by memoizing the new comment form
2010-12-07 09:28:11 -08:00
Raphael
f421f1327c
Take nested queried out of aspects manage
2010-12-07 00:21:05 -08:00
danielvincent
d3483c1cd5
forgot to remove something...
2010-12-07 00:00:34 -08:00
danielvincent
de0ecff5b7
aspects first on home contact list.
2010-12-06 23:59:16 -08:00
Raphael
9442553504
Refactor aspectscontroller and aspect_contacts.haml
2010-12-06 17:20:21 -08:00
Raphael
14a9bc02f9
Move aspect_contacts in to aspects
2010-12-06 17:20:21 -08:00
Raphael
c034113a7c
Refactor to aspect partial
2010-12-06 17:20:21 -08:00
Raphael
32a2264af5
Refactor peoplecontroller index
2010-12-06 13:36:20 -08:00
danielvincent
460081bc2f
don't condense comments on show pages
2010-12-05 17:21:57 -08:00
MrZYX
b84b6ea9e4
some fixes to translations
2010-12-05 16:02:52 +01:00
Raphael
c320dae589
Add a cuke for being invited by someone
2010-12-05 00:15:37 -08:00
maxwell
0a8af9e72b
DG MS some fixes for getting started
2010-12-04 23:05:47 -08:00
Sarah Mei
9da69a4b01
Mobile log in form is usable. Also, added mixins for sass.
2010-12-04 20:45:52 -08:00
danielvincent
03961bce7b
removed last reference to invitation fancybox
2010-12-04 20:06:24 -08:00
Sarah Mei
fea6884acc
Mobile homepage looks decent.
2010-12-04 19:30:14 -08:00
danielvincent
c4db32c253
adding jquery 1.4.4 back re sentientwaffle's fix.
2010-12-04 18:59:01 -08:00
maxwell
e47730b63f
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 17:39:19 -08:00
danielvincent
948707ea23
rolling back jquery. <= 1.4.3 has compatability issues with rails js helpers
2010-12-04 17:22:22 -08:00
maxwell
b9ab799569
ironing out invites
2010-12-04 16:49:45 -08:00
maxwell
b300adbef5
fixed a potentially bad bug with nil invite tokens
2010-12-04 16:13:44 -08:00
maxwell
8306cfffde
add token back to invite form
2010-12-04 16:03:35 -08:00
danielvincent
34a1a35bf1
skip getting started is not ajaxy
2010-12-04 12:06:08 -08:00
danielvincent
47b6d66b83
fixed proportions in stream, etc.
2010-12-03 23:38:29 -08:00
maxwell
94c7b86a55
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-03 19:34:12 -08:00
danielvincent
5da5ee26bb
two column aspect listing on manage page. made avatars smaller.
2010-12-03 16:22:20 -08:00
maxwell
b8ece9381a
fixing up public image show
2010-12-03 15:48:27 -08:00
maxwell
85a85716c6
made user sign up and invitation accept slightly nicer, w/tipsy tooltips and instructions
2010-12-03 13:57:47 -08:00
danielvincent
7fdbc9015b
swapped new invitation lightbox for a proper page.
2010-12-03 00:57:53 -08:00
danielvincent
30668bf2e6
visual touchups
2010-12-02 23:19:30 -08:00
maxwell
579a288351
public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable
2010-12-02 18:48:50 -08:00
maxwell
38d9d75162
posts now have public permalinks
2010-12-02 18:47:48 -08:00
danielvincent
756824d072
removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec.
2010-12-02 18:42:21 -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
Sarah Mei
c7b1fcc806
Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master
2010-12-01 22:53:58 -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
Sarah Mei
d6e8873b64
Revert "View fixed after rebase according to latest changes."
...
This reverts commit 76edca1366
2010-12-01 22:29:04 -08:00
Dan Hansen
d76ae86180
2010-12-01 22:13:15 -08:00
Dan Hansen
f3e3e0f344
2010-12-01 22:12:57 -08:00
maxwell
e18b918676
MS DG only show three comments by default
2010-12-01 18:09:41 -08:00
danielvincent
ee47a2ffda
fixed diaspora logo asset on landing page
2010-12-01 16:18:13 -08:00
Raphael
8d853a88a3
Remove some old views, clean up routes, clean up.
2010-12-01 15:38:56 -08:00
root
5cd0a60073
Moved to it's own file, added specs
2010-12-02 02:22:05 +03:00
root
9e7d7f420f
hate text editing in nano
2010-12-02 00:57:56 +03:00
root
b1c1175c67
javascript validations for username
2010-12-02 00:54:35 +03:00
danielvincent
d392239355
removed brandongrotesque from repo, logos are now assets.
2010-12-01 11:45:54 -08:00
Raphael
ef083c6770
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-01 11:21:36 -08:00
Raphael
5791ffba79
Add administrative mail method
2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations
2010-12-01 19:13:39 +01:00
Paweł Wilk
76edca1366
View fixed after rebase according to latest changes.
2010-12-01 18:23:21 +01:00
Paweł Wilk
017251fef9
Added genderized variants of t() to views, controllers and helpers.
2010-12-01 18:19:48 +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
Josh Lubaway
ecd1d2ecd6
Bug #624 Can't unset birthday
...
This change allows users to "unset" their birthday.
Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.
Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
2010-11-30 21:23:47 -08: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
Raphael
4f3d031e89
Always set translations
2010-11-30 15:58:25 -08:00
Raphael
3dc3efc103
Move aspect contacts pane js to public
2010-11-30 15:57:32 -08:00
Raphael
bfcae7fd80
Always set translations
2010-11-30 15:44:27 -08:00
