nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9934 commits 4 branches 0 tags 121 MiB
Commit graph

2118 commits

Author SHA1 Message Date
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00
Daniel Grippi
c27d0b8780 Merge pull request #2281 from justindthomas/backup-postgres 
backup task handles postgresql dumps
 2011-11-29 14:09:51 -08:00
Jonne Hass
2f3876ec64 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-29 21:02:55 +01:00
Jonne Hass
759015a309 updated 51 locale files [ci skip] 2011-11-29 21:02:43 +01:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
e16e28a7eb better english 2011-11-29 08:36:48 +01:00
Daniel Grippi
908d0b99a7 Merge pull request #2404 from torrancew/capistrano_colorized 
Capistrano colorized
 2011-11-28 09:11:10 -08:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Jordi Mallach
963fe2cf76 Remove extra # in Catalan translation. 2011-11-27 22:30:45 +01:00
Jordi Mallach
c17d9973aa Update Catalan translation to 64a8083. 2011-11-27 05:16:30 +01:00
David Morley
64a8083744 add pp and toc for translation 2011-11-26 13:30:40 -08:00
Jonne Hass
8d6f1552e3 updated 11 locale files [ci skip] 2011-11-26 21:15:00 +01:00
Vittorio Cuculo
df45a628c5 Fix typo 2011-11-24 09:17:13 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Jonne Hass
61d809659c updated 11 locale files [ci skip] 2011-11-22 20:30:58 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Jonne Hass
bb356f07cb updated 62 locale files [ci skip] 2011-11-19 12:26:07 +01:00
Jonne Hass
e60f287fc7 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-17 14:53:52 +01:00
Jonne Hass
0e10d28bb0 updated 64 locale files [ci skip] 2011-11-17 14:53:37 +01:00
Jordi Mallach
5a0b70f644 Update Catalan translation to 09bad3a. 2011-11-16 22:13:01 +01:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
Tray Torrance
c46c07f648 Added color definition file at config/cap_colors.rb 2011-11-15 09:06:15 -08:00
Jakob Kramer
3f3dbf0c6c deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now 2011-11-15 14:42:47 +01:00
Tray Torrance
bbc165137f Adds capistrano_colors gem; deprecates custom red method 
Also adjusts current_git_branch to use Capistrano's logger for printing to
STDOUT
 2011-11-15 01:41:41 -08:00
Tray Torrance
76d31f3110 Hooks current_git_branch to before deploy:update 
Also refactors after deploy:symlink hooks
 2011-11-15 01:41:41 -08:00
Tray Torrance
0775f9032e Refactors require statements 2011-11-15 01:41:41 -08:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Jonne Hass
ae8acdbfe1 typo [ci skip] 2011-11-14 22:10:18 +01:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Jonne Hass
0e08c59827 do not disable resque web by default in production 2011-11-14 16:11:26 +01:00
Jonne Hass
6526e2f305 fix #2392 2011-11-13 22:37:18 +01:00
Jonne Hass
4013335be9 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-12 22:14:13 +01:00
Jonne Hass
1cf1c5ce3b updated 9 locale files [ci skip] 2011-11-12 22:13:59 +01:00
Jonne Hass
5437b6fbd0 okay that didn't work, lets try it this way 2011-11-12 11:36:16 +01:00
Jonne Hass
3c980b7201 added fix for using sendmail with exim, the default -t argument behaves different so lets take it out 2011-11-12 11:24:49 +01:00
Jordi Mallach
2dbf467490 Update Catalan devise translation to f2123d9. 2011-11-12 03:59:27 +01:00
Jordi Mallach
e4f91ddf93 Fix typo. 2011-11-12 03:59:10 +01:00
Jordi Mallach
0aaa262de1 Remove trailing tab character. 2011-11-12 03:58:29 +01:00
Jonne Hass
36a68f5272 specify protocol for url helpers in action mailer 2011-11-11 22:49:18 +01:00
Jonne Hass
27996e9bb2 updated 54 locale files [ci skip] 2011-11-11 21:39:20 +01:00
Jonne Hass
907887b839 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-11-10 14:25:15 +01:00
Jonne Hass
67b8881198 updated 15 locale files [ci skip] 2011-11-10 14:24:49 +01:00
Jordi Mallach
5730aea142 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-11-10 03:16:30 +01:00
Jordi Mallach
bfbb8e5f8f Update Catalan translation to eb6fc5f. 2011-11-10 03:15:56 +01:00
Daniel Grippi
eb6fc5f130 Merge pull request #2367 from lprelle/newhere_to_locale_translation 
#NewHere to locale translation
 2011-11-09 16:09:12 -08:00