maxwell
|
32390933e8
|
PALINDROME message for multiple emails
|
2010-11-23 00:14:26 -08:00 |
|
maxwell
|
da16e3ee1e
|
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
|
2010-11-23 00:08:30 -08:00 |
|
Dan Goldenberg
|
bfc1fa4da0
|
added getting_started text and new press logos
|
2010-11-22 21:07:01 -08:00 |
|
danielvincent
|
69cac02ade
|
landing page fix
|
2010-11-22 20:35:30 -08:00 |
|
maxwell
|
0965b45f23
|
fixing getting started 2
|
2010-11-22 18:28:04 -08:00 |
|
maxwell
|
ffedd9fa77
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-22 17:30:00 -08:00 |
|
maxwell
|
b283f5c579
|
pulling back needed partial
|
2010-11-22 17:29:51 -08:00 |
|
maxwell
|
173ec5f73b
|
Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
This reverts commit c45893d07d.
Conflicts:
config/locales/diaspora/en.yml
|
2010-11-22 17:11:34 -08:00 |
|
danielvincent
|
c63319f127
|
aspect#show cleanup. added 3 icons.
|
2010-11-22 17:03:33 -08:00 |
|
maxwell
|
21a90656fd
|
fixing translations
|
2010-11-22 16:55:06 -08:00 |
|
maxwell
|
1adf93ace1
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
config/locales/diaspora/en.yml
|
2010-11-22 16:40:01 -08:00 |
|
maxwell
|
c45893d07d
|
remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar
|
2010-11-22 16:38:10 -08:00 |
|
Sarah Mei
|
bedc7ca41b
|
Made landing page and log in views content-type agnostic.
Added an un-minified version of jquery-mobile for debugging.
|
2010-11-22 15:02:25 -08:00 |
|
zhitomirskiyi
|
e84ce5591f
|
The discription in several places
|
2010-11-22 14:55:30 -08:00 |
|
zhitomirskiyi
|
edbb0bdf07
|
slightly more discriptive cannot remove the person from the last aspect messagge
|
2010-11-22 14:52:39 -08:00 |
|
Sarah Mei
|
ab37fd0d98
|
Fix type-o on front page, copy edit a bit.
|
2010-11-22 14:11:27 -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 |
|
maxwell
|
5c2d161146
|
small changes to mobile
|
2010-11-22 01:19:11 -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
|
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 |
|
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
|
ea7bdfde28
|
fix validation and order of status message sent
|
2010-11-21 16:13:01 -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 |
|
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 |
|
Alec Leamas
|
a3395b6de8
|
Bugfix (thanks, MrXYZ)
|
2010-11-21 12:08:52 +01:00 |
|
Hexagon
|
93b0f3fd81
|
Updating rails-i18n
|
2010-11-21 01:52:59 +01:00 |
|
Alec Leamas
|
0a3a787ffa
|
Merge branch 'jammit'
|
2010-11-20 18:35:45 +01:00 |
|
Alec Leamas
|
b6648cb9e2
|
Handle jammit by precaching in script/server.
This introduces some jammit warnings in 'rake spec'. These seem
to be just warnings. To get rid of them, take steps as described in
https://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora
in the "Read-only Installation" (sic!) chapter.
|
2010-11-20 18:32:40 +01:00 |
|
MrZYX
|
b97abbd251
|
hebrew is at 100%, thanks yaron
|
2010-11-20 14:40:57 +01:00 |
|
MrZYX
|
b0f4a871ee
|
dutch is at 100%, thanks Kevin Kleinman
|
2010-11-20 13:29:55 +01:00 |
|
MrZYX
|
50120878fb
|
updated locales from 99translations
removed fr-informal
german is at 100%
swedish is at 100%, thanks Hexagon
french is at 100%, thanks ed0h
russian is at almost 90%, thanks rapmon
|
2010-11-20 01:16:01 +01:00 |
|
Hexagon
|
d6695501f7
|
Merge branch 'more-translatable' of https://github.com/MrZYX/diaspora into MrZYX-more-translatable
|
2010-11-19 22:04:39 +01:00 |
|
zhitomirskiyi
|
481204a157
|
mongo cloudfiles backup task
|
2010-11-19 10:57:28 -08: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 |
|
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 |
|
Alec Leamas
|
5b8eb2cacd
|
Production/test mode somment in config/server.sh
|
2010-11-19 00:34:10 +01:00 |
|
MrZYX
|
dcbcaefcbe
|
added language codes map
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
60375422e7
|
pulled update for sk.yml from the rails i18n project
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
3f76699805
|
pulled update for et.yml from rails i18n
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
13ca682734
|
added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales
|
2010-11-18 15:13:30 -08:00 |
|
Raphael
|
61692c1da6
|
Fix translation missing in inv mailer
|
2010-11-18 12:50:46 -08:00 |
|
Raphael
|
187e9ac198
|
Merge remote branch 'jandom/475-Chore-Add-missing-polish-locales'
|
2010-11-18 11:59:55 -08:00 |
|
maxwell
|
3b88121244
|
dammit jammit... dont package always dur
|
2010-11-18 09:24:01 -08:00 |
|
maxwell
|
2ffd2d93e3
|
made mailchimp form ssl
|
2010-11-17 23:19:12 -08:00 |
|
maxwell
|
f01fca1877
|
letting jammit do its default thing
|
2010-11-17 22:18:15 -08:00 |
|
maxwell
|
5e375a30d8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:06:08 -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
|
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 |
|
maxwell
|
1ca5e25e53
|
adding default for google a analytics
|
2010-11-17 12:35:42 -08:00 |
|
Jan
|
b088e0d685
|
Added missing polish locales, using all of the previous translations.
|
2010-11-17 20:50:38 +01: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 |
|
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 |
|
maxwell
|
f6c6030c6d
|
fixing a translation
|
2010-11-15 23:08:57 -08:00 |
|
zhitomirskiyi
|
c5ae73f96d
|
websocket secure params in app_config
|
2010-11-15 17:45:52 -08:00 |
|
Raphael
|
de1fed70f0
|
Add logging statement to server startup
|
2010-11-15 16:56:30 -08:00 |
|
Raphael
|
1b39b79446
|
Make invitation view with no inviters sensible
|
2010-11-15 16:35:00 -08:00 |
|
Hexagon
|
13a2b8ce07
|
Small fix to devise.sv
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
1d3d2565df
|
Forgot to change en.yml, here it is
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
35095f8859
|
Update of sv.yml to reflect latest changes + small fix to en.yml
|
2010-11-15 22:28:36 +01:00 |
|
Raphael
|
d3098cf6bc
|
Add option to close registration in app_config
|
2010-11-15 12:15:40 -08:00 |
|
Alec Leamas
|
3abb2c9751
|
app_config update
Attempt to close http://bugs.joindiaspora.com/issues/463, establishing a
new style in app_config.yml. Many comments needs to be reviewed.
|
2010-11-15 09:10:35 +01:00 |
|
danielvincent
|
969c668518
|
translation fix on _person.haml. button tweak
|
2010-11-13 12:10:09 -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 |
|
livefromthemoon@gmail.com
|
82f9aefaa8
|
Updated some french translation strings
|
2010-11-12 12:26:34 -08:00 |
|
livefromthemoon@gmail.com
|
cdfc406aad
|
Added missing french translations
|
2010-11-12 12:26:34 -08:00 |
|
Raphael
|
a4d7b25bac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 11:54:19 -08:00 |
|
danielvincent
|
4976503c0f
|
let nginx serve static assets.
|
2010-11-12 11:47:19 -08:00 |
|
Jonne Hass
|
1816b1e4df
|
people.show.add_friend -> people.person.add_friend
|
2010-11-12 06:07:37 +01: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 |
|
Hexagon
|
52da9c84ed
|
Update of sv.yml to match latest additions
|
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 |
|
Hexagon
|
a4f5a1e7ae
|
Updated swedish translation
|
2010-11-12 06:07:36 +01:00 |
|
MrZYX
|
748efb1860
|
eliminated senseless duplicates in en.yml
|
2010-11-12 06:07:36 +01:00 |
|
Jonne Hass
|
a957ba3aed
|
so then I remove the newly unused friends_since for you
|
2010-11-12 06:06:16 +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 |
|
maxwell
|
034d7ee2b1
|
first commit
|
2010-11-09 15:29:43 -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
|
21cdbf08b5
|
we need to ask to publish on peoples wall...this was working because we all installed it with minifb which asked for everything
|
2010-11-08 01:26:11 -08:00 |
|
danielvincent
|
020cd90341
|
aspect labels on people#show view
|
2010-11-06 11:09:11 -07:00 |
|
danielvincent
|
1a481d43d2
|
Use _stream_element.haml as a wrapper for posts in the stream.
|
2010-11-05 17:40:28 -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 |
|
Raphael
|
061ec59091
|
Merge remote branch 'jdeisenberg/511-nonstandard-mongo-port'
|
2010-11-04 19:55:09 -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
|
7d125e68e9
|
Warn rather than failing if there is no smtp sender address
|
2010-11-04 16:55:15 -07:00 |
|
Raphael
|
c3a38eaab4
|
Merge remote branch 'MrZYX/396-smtp-sender-address'
|
2010-11-04 16:47:57 -07:00 |
|