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

9825 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sarah Mei & Tim Frazer
409a6aebc7 Fix invitation controller spec on postgres 2011-11-14 17:41:54 -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
Sarah Mei & Tim Frazer
ebad0f5ec3 Don't try to follow diasporahq during cucumber tests 2011-11-14 16:55:59 -08:00
Sarah Mei & Tim Frazer
782a2a5446 Add Tim to the pairs file 2011-11-14 16:37:20 -08:00
Michael Sofaer & Sarah Mei
8294472420 Merge branch 'master' of https://github.com/diaspora/diaspora 2011-11-14 14:16:20 -08:00
Michael Sofaer & Sarah Mei
3e1d06ded3 Memorial splash page 2011-11-14 14:16:09 -08:00
Jonne Hass
ae8acdbfe1 typo [ci skip] 2011-11-14 22:10:18 +01:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b Merge branch 'master' of github.com:diaspora/diaspora 2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a Background sending password reset instructions. 2011-11-14 12:30:47 -08:00
Michael Sofaer & Sarah Mei
8c0bdd3650 Merge branch 'master' of https://github.com/diaspora/diaspora 2011-11-14 12:30:15 -08:00
Michael Sofaer & Sarah Mei
0c33791069 Image for Ilya 2011-11-14 12:27:12 -08: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
Pistos
05b1e2fc19 Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag. 
e.g. if "test" exists and you try to follow "Test".
 2011-11-13 23:26:53 -05: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
Dennis Schubert
ddedf73e59 Merge pull request #2344 from 21echoes/padded_profile 
padded profile
 2011-11-12 03:51:37 -08: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
Jordi Mallach
2b2c963187 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-11-12 03:30:53 +01:00
Jonne Hass
9839ac559c fixed timeago for posts#show if not logged in 2011-11-11 23:06:08 +01:00
Jonne Hass
65f8136690 made public translatable in the publisher dropdown 2011-11-11 23:00:46 +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
Pistos
ef075b7b15 Don't render "getting started" help text over aspect dropdown if the user isn't actually getting started. 
This fixes a UI bug which showed remnants of the "getting started" text on hover.
 2011-11-10 20:41:09 -05:00
Pistos
d3d92e5957 Only render "getting started" help text for users that really are getting started. 
This fixes a UI bug which showed remnants of the "getting started" frontend code on hover.
 2011-11-10 20:04:26 -05:00
Pistos
ef990e04cd Refactor new user helper text in publisher; improved code readability. 2011-11-10 20:03:52 -05:00
Jonne Hass
b3142ac208 redirect to sign in page from photo#show on a private photo when user isn't signed in 2011-11-10 22:44:12 +01:00
Jonne Hass
5d08bddb5b updated SystemTimer to 1.2.3 2011-11-10 21:49:09 +01:00
Jonne Hass
10fa7ba024 fixed 500 on photos#show for private photos and logged out user 2011-11-10 19:31:00 +01:00
Raphael Sofaer
cfbc2b7546 Revert "Merge pull request #2375 from michaelklishin/patch-1" 
This reverts commit e109d22ce5, reversing
changes made to 4f993b3d24.
 2011-11-10 13:14:45 -05:00
Raphael Sofaer
e109d22ce5 Merge pull request #2375 from michaelklishin/patch-1 
Do not install ruby-debug on travis-ci.org, it only wastes time
 2011-11-10 09:18:43 -08:00
Jonne Hass
4f993b3d24 fix jasmine spec 2011-11-10 18:15:23 +01:00
Michael Klishin
7f6f8f651c Do not install ruby-debug on travis-ci.org, it only wastes time 
We are trying to make Ruby project maintainers aware of how long it takes to compile linecache
every time. See https://twitter.com/#!/travisci/status/134609246036836352.
 2011-11-10 20:40:46 +04:00
Pistos
ae07b7c559 Publisher: Hook up same "after keypress" handler to "after mouse click", because the text can change without any keypresses (paste, etc.). 2011-11-10 11:38:39 -05:00
Pistos
d87c0a9b44 Don't assume specific translation for aspects title. 2011-11-10 11:20:31 -05:00
Pistos
3e689ec988 Whitespace cleanup. 2011-11-10 11:20:24 -05:00
Jonne Hass
7d1dbf4743 Merge pull request #2373 from lprelle/newhere_to_locale_translation_fix 
added translation to tag_path in _right_selection
 2011-11-10 06:36:23 -08:00
Lennart Prelle
d95b28a9be added translation to tag_path in _right_selection 2011-11-10 15:14:07 +01:00
Jonne Hass
919b010e06 fix step definition 2011-11-10 15:05:32 +01:00
Jonne Hass
f4da95cd0e Merge branch 'post-deletion-spinner-fixes' of https://github.com/Pistos/diaspora 2011-11-10 14:45:22 +01:00
Jonne Hass
188f429998 Merge branch 'issue1924-cucumber-tests' of https://github.com/Gonzih/diaspora 
Conflicts:
	features/posts_from_main_page.feature
	features/step_definitions/custom_web_steps.rb
 2011-11-10 14:45:00 +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
120a23d547 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-11-10 11:11:31 +01:00
Pistos
5f73cdc67d Only show post deletion spinner when the AJAX call actually gets underway (i.e. not when the user cancels the deletion). 2011-11-10 00:50:43 -05:00