danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
danielvincent
|
a21af7cac6
|
friend_users -> connect_users in helper_methods
|
2010-11-12 20:22:54 -08:00 |
|
zhitomirskiyi
|
9850783fd7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 16:34:23 -08:00 |
|
zhitomirskiyi
|
a414f2cfc3
|
added the missing gzip types and IE disable
|
2010-11-12 16:34:10 -08:00 |
|
Raphael
|
64cf82a06b
|
Websocket server no longer fails hard on a bad cookie or a db reset
|
2010-11-12 16:21:09 -08:00 |
|
Sarah Mei
|
0467d7ad5e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 17:04:48 -06:00 |
|
Sarah Mei
|
6c439608f0
|
started specs for AspectEdit.deletePersonFromAspect
|
2010-11-12 17:04:15 -06:00 |
|
Raphael
|
90474d9acb
|
Attempt to fix websocket bug, default pidfile location
|
2010-11-12 14:59:13 -08:00 |
|
Sarah Mei
|
9586ebb67e
|
specs for AspectEdit.onMovePersonSuccess
|
2010-11-12 16:44:22 -06:00 |
|
Sarah Mei
|
737c812e08
|
Specs for AspectEdit.onDeleteRequestSuccess
|
2010-11-12 16:38:02 -06:00 |
|
zhitomirskiyi
|
ef5a9ede2e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 14:30:29 -08:00 |
|
zhitomirskiyi
|
f0f491b124
|
another typo
|
2010-11-12 14:29:57 -08:00 |
|
Raphael
|
791798fe0f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 14:12:06 -08:00 |
|
Raphael
|
1a5aa02c77
|
Removing :value => on hidden_field_tag. Thanks npouillard.
|
2010-11-12 14:10:49 -08:00 |
|
Sarah Mei
|
506d13335a
|
Finally have complete specs for AspectEdit.onDropMove.
|
2010-11-12 16:05:17 -06:00 |
|
zhitomirskiyi
|
c0dcd37cde
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 14:01:11 -08:00 |
|
zhitomirskiyi
|
47d6f82b5f
|
another little typo
|
2010-11-12 14:00:34 -08:00 |
|
zhitomirskiyi
|
da58422036
|
chef typo
|
2010-11-12 13:41:52 -08:00 |
|
Sarah Mei
|
b77547e940
|
Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend
|
2010-11-12 14:51:16 -06:00 |
|
Raphael
|
1e842f1a88
|
Render mail css as a partial, fix spec
|
2010-11-12 12:26:34 -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 |
|
Raphael
|
ae9f4ab969
|
Refactor mail views, add a spec to make sure CSS is rendered
|
2010-11-12 11:47:59 -08:00 |
|
danielvincent
|
4976503c0f
|
let nginx serve static assets.
|
2010-11-12 11:47:19 -08:00 |
|
Sarah Mei
|
feec6d971d
|
More specs for aspect edit JS
|
2010-11-12 13:40:23 -06:00 |
|
zhitomirskiyi
|
26c4760e25
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 11:36:50 -08:00 |
|
zhitomirskiyi
|
6544d8235b
|
now running thins through ports since sockets were not working for some reason
|
2010-11-12 11:36:34 -08:00 |
|
Raphael
|
0e8b1efefd
|
Merge remote branch 'MrZYX/en.yml-refactor'
|
2010-11-12 11:28:05 -08:00 |
|
Alec Leamas
|
bbdc22ed35
|
Add log directory
Adding the toplevel log directory, part of standard rails directory layout.
|
2010-11-12 11:21:54 +01:00 |
|
Alec Leamas
|
6888398ba7
|
Removing file \'
|
2010-11-12 11:20:10 +01:00 |
|
Alec Leamas
|
91501dc309
|
Pkg update (re-added)
|
2010-11-12 11:18:28 +01:00 |
|
Alec Leamas
|
c18a3518ac
|
Preparing to re-add pkg
|
2010-11-12 11:16:04 +01:00 |
|
danielvincent
|
716a77f0cc
|
fixing a refactor that broke friend requesting from the ui
|
2010-11-11 21:26:40 -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
|
3b303e1cf2
|
adding fancybox assets back
|
2010-11-11 19:42:11 -08:00 |
|