David Morley
|
1859975ab1
|
remove resque, remove 404 images from bothering thin
|
2011-11-26 14:02:31 -08: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 |
|
Sarah Mei
|
a594d8f7ce
|
Fix cucumber log in and close account feature
|
2011-11-25 04:48:47 -08:00 |
|
Sarah Mei
|
81476b79ca
|
The home page is now /stream
|
2011-11-25 03:54:47 -08:00 |
|
Jonne Hass
|
a91c7faffe
|
Merge pull request #2435 from vcuculo/master
Fix typo + Show diaspora_handle on profile [mobile]
|
2011-11-24 01:09:24 -08:00 |
|
Vittorio Cuculo
|
fdd52782d2
|
show diaspora_handle on profile [mobile]
|
2011-11-24 09:42:15 +01:00 |
|
Vittorio Cuculo
|
df45a628c5
|
Fix typo
|
2011-11-24 09:17:13 +01:00 |
|
Johannes Hackel
|
ef28e89809
|
people_controller_spec
|
2011-11-23 23:45:09 +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 |
|
Johannes Hackel
|
0c1be5002d
|
end
|
2011-11-23 08:00:08 +01:00 |
|
Michael Sofaer
|
2b8d07f94b
|
Censorship point has been made ... for now.
|
2011-11-22 15:54:50 -08:00 |
|
Jonne Hass
|
61d809659c
|
updated 11 locale files [ci skip]
|
2011-11-22 20:30:58 +01:00 |
|
Johannes Hackel
|
66acd7db14
|
specs, stay on page
|
2011-11-22 12:54:19 +01:00 |
|
Johannes Hackel
|
eb65074360
|
Fix Bug 2274, empty tag
|
2011-11-22 12:16:00 +01:00 |
|
Dan Hansen & Sarah Mei
|
d9bd25e114
|
Only repopulate cache on contact destroy if user exists
|
2011-11-21 21:39:26 -08:00 |
|
Gonzalo Rodriguez
|
0de6512789
|
Decrease cukes default wait time
This will not fix cukes, but at least travis is going
to throw failures output instead of timing out
|
2011-11-22 00:18:14 -02:00 |
|
Johannes Hackel
|
7368bb9e62
|
comment_stream
|
2011-11-20 18:37:10 +01:00 |
|
Dan Hansen & Sarah Mei
|
7e4028626f
|
Fix lightbox for non-logged-in user
|
2011-11-19 21:45:31 -08:00 |
|
Sarah Mei
|
ad27eaac3d
|
Fix photo#show for non-logged-in user
|
2011-11-19 21:17:39 -08:00 |
|
Manuel
|
1c9a96e2aa
|
Fixed relayable specs
|
2011-11-20 01:06:45 +01:00 |
|
Jonne Hass
|
c7f19eb592
|
update to rails 3.0.11
|
2011-11-19 13:53:49 +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 |
|
Jake Peryl
|
07f05ebead
|
Issue #2284: simple fix
|
2011-11-17 01:22:01 +01:00 |
|
danielgrippi
|
cc4531f73c
|
stop censorship. sopa
|
2011-11-16 16:04:21 -08:00 |
|
Jordi Mallach
|
5a0b70f644
|
Update Catalan translation to 09bad3a.
|
2011-11-16 22:13:01 +01: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 |
|
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
|
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 |
|