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

9853 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
cc4531f73c stop censorship. sopa 2011-11-16 16:04:21 -08:00
Jonne Hass
565ef69441 translate Email in the sidebar 2011-11-16 21:55:09 +01:00
Manuel Schölling
335a7b4ebe Modified session steps to work with /public/index.html 2011-11-16 20:25:54 +01:00
Jonne Hass
74582fe07d Merge pull request #2340 from manuels/userignore_icon 
Modified "Ignore user" icon
 2011-11-16 10:48:55 -08: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
Michael Sofaer
83ee7702a4 Merge pull request #2406 from torrancew/sod_fixes 
Sod fixes
 2011-11-15 19:59:35 -08:00
Tray Torrance
6dc00e84d8 Removes ruby-full: sod installs ruby; Cleans up whitespace on other debian packages 2011-11-15 19:40:22 -08:00
Tray Torrance
7956c234bd Adjusts splunk chef recipe to name the splunk download properly 2011-11-15 18:06:54 -08:00
Tray Torrance
2d54132abe Added known necessary debian packages 2011-11-15 18:06:54 -08:00
Tray Torrance
4df938425f Changed references for common cookbook to diaspora cookbook 2011-11-15 18:06:54 -08:00
Tray Torrance
a197f16e5f Renames main.rb to default.rb for sod 2011-11-15 18:06:54 -08:00
Manuel Schölling
845acc6120 Made Ilya's profile static 2011-11-15 20:55:44 +01:00
danielgrippi
8e55fc158b use root_path in header if not logged in 2011-11-14 19:04:27 -08:00
Kevin Fitzpatrick & Michael Sofaer
80b03d09cc Tweak sodfile, working on new app server 2011-11-14 18:39:23 -08:00
danielgrippi
9fa01f9427 serve splash page image out of cloudfront CDN 2011-11-14 18:18:40 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
pivotalcommon
52aaf33296 Merge pull request #2402 from 21echoes/cuke_path_fix 
minor error in features/paths.rb regarding the recent split of posts and photos
 2011-11-14 17:43:19 -08:00
Sarah Mei & Tim Frazer
a6f11e86dc Merge branch 'master' of https://github.com/diaspora/diaspora 2011-11-14 17:42:14 -08:00
Sarah Mei & Tim Frazer
409a6aebc7 Fix invitation controller spec on postgres 2011-11-14 17:41:54 -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
Kevin Fitzpatrick & Michael Sofaer
51ba939875 for now, check in index as a flat file 2011-11-14 17:16:13 -08:00
David Kettler
79da38d929 now that photos are not posts, we gotta send posts to the post path in cucumber tests 2011-11-14 17:14:10 -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