Commit graph

1077 commits

Author SHA1 Message Date
David Morley
e3df222d0e move file 2011-02-15 10:42:02 -08:00
MrZYX
cd2d7db7b2 workaround from https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror 2011-02-12 21:31:14 +01:00
MrZYX
a572637e4c fix a translation 2011-02-12 18:06:56 +01:00
MrZYX
8639e08920 updated locales 2011-02-12 14:41:13 +01:00
Raphael Sofaer
d202200a88 tweak copy 2011-02-11 18:04:00 -08:00
zhitomirskiyi
ea3afa6720 added the mention explanation text 2011-02-11 17:31:23 -08:00
MrZYX
3dbfc85aa9 updated locales 2011-02-11 17:20:07 +01:00
Raphael Sofaer
bb58544a70 Add logging for GC (slight slowdown, but worth it for the data) 2011-02-10 15:52:00 -08:00
maxwell
c6e0379a00 fixing engrish in translation 2011-02-10 14:02:36 -08:00
zhitomirskiyi
717d2e09c9 fixed the translation in the email 2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
Raphael Sofaer
f1c63939f9 Revert "added sliding animation to stream elements, shadow on autocomplete box."
This reverts commit dc760f9583.
2011-02-10 10:36:30 -08:00
MrZYX
4997fbdbd9 updated locales 2011-02-10 15:41:43 +01:00
danielvincent
dc760f9583 added sliding animation to stream elements, shadow on autocomplete box. 2011-02-09 20:07:25 -08:00
maxwell
b24272474d document s3 in app_config.yml.example 2011-02-09 17:42:21 -08:00
Raphael Sofaer
cb67c14a51 Make cap deploy follow a branch in deploy_config.yml 2011-02-09 16:07:24 -08:00
Raphael Sofaer
0ec2d918bb adding keycodes file, moving keyup stuff to keydown 2011-02-09 16:07:24 -08:00
MrZYX
f0650a6135 updated locales 2011-02-09 17:05:47 +01:00
zhitomirskiyi
eecf1d5d82 fixed cucumber, localization, and css 2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial"
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a invitation text
setting the invites

added requests to the fb hash

finder has options

remove the requester from the list

typo

making a block

another typo

remove the if statement for the notifications

checking on the right field

translations and correct indenting

fixed stuff added

added a temp puts

added a temp puts

now actually referencing the service

not double nesting

remove stream element

updated remote friends to old style

removed it from the h1 block

putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
a398184081 WIP 2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421 translating the warning about removing the person from the last aspect 2011-02-08 15:44:12 -08:00
MrZYX
6e0e46435e localize dates 2011-02-08 16:26:56 +01:00
MrZYX
2c06397fd9 updated locales 2011-02-08 15:06:12 +01:00
danielvincent
bf20e5a9e8 remove some js assets from mobile 2011-02-06 23:09:04 -08:00
danielvincent
42993de739 added back to comments; avatar. 2011-02-06 09:26:24 -08:00
MrZYX
b26e214001 updated locales 2011-02-06 16:04:06 +01:00
zhitomirskiyi
59f0dca7c7 Revert "publisher is now a hot widget"
This reverts commit 8039ab312a.
2011-02-05 15:24:20 -08:00
zhitomirskiyi
b49f54144e resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a WIP 2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4 resending of invitation in resque and works 2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01:04 -08:00
Dan Hansen
8039ab312a publisher is now a hot widget 2011-02-05 16:47:43 -06:00
MrZYX
5b1737b817 updated locales 2011-02-04 19:11:39 +01:00
maxwell
ce010c24ec update jquery mobile to a3 2011-02-03 20:41:38 -08:00
maxwell
ee02a073cd toggle mobile site, when mobile device 2011-02-03 18:43:56 -08:00
danielvincent
8269e4b300 touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
MrZYX
9ae6ba4d66 updated locales 2011-02-03 15:35:59 +01:00
MrZYX
99cf9904f9 put jquery-ui back in as we need it for /aspects/manage at least 2011-02-02 16:56:50 +01:00
MrZYX
5ed587ddcd updated locales 2011-02-02 16:23:12 +01:00
MrZYX
423cd7807b Merge branch 'master' of github.com:diaspora/diaspora 2011-02-01 22:45:28 +01:00
MrZYX
15329af94d made "Search for" translatable 2011-02-01 21:55:28 +01:00
zhitomirskiyi
bc058332d3 commented on post email now includes the comment 2011-02-01 12:54:05 -08:00
Raphael
7d18e2bcd8 Finish autocomplete 2011-02-01 11:56:56 -08:00
Raphael
7be232e33e autocomplete wip 2011-02-01 11:56:56 -08:00
Raphael
9080649180 Starting work on an autocomplete feature 2011-02-01 11:56:56 -08:00
MrZYX
d8f5607509 updated locales 2011-02-01 16:56:29 +01:00
Raphael
c56eaadfa0 Make person profile a little bit aware of an incoming request 2011-01-31 15:47:01 -08:00
Raphael
0e2243e620 use capture and captures to detect thins in /service 2011-01-31 15:28:43 -08:00