Alec Leamas
23e566ce2e
bugfix
2010-11-01 06:13:31 +01:00
Alec Leamas
6037dc1ca4
Merge branch 'pkg-refactor'
2010-11-01 05:20:55 +01:00
Alec Leamas
d8376b5a84
bugfix, refactor funcs
2010-11-01 05:20:33 +01:00
Sarah Mei
8193f2e350
Adding the rest of the new user setup to cucumber.
...
wip scenario for skipping the profile wizard.
2010-10-31 20:05:15 -07:00
Sarah Mei
a9cbf43fa4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-31 20:04:49 -07:00
Sarah Mei
50efd27710
Removing webmock from cucumber - interferes with capybara (more investigation needed).
2010-10-31 20:04:24 -07:00
zhitomirskiyi
c86a3eb608
moved getting started logic to the controller
2010-10-31 19:33:11 -07:00
Sarah Mei
e69da7c5e8
Cucumber feature for user registration.
2010-10-31 17:50:03 -07:00
Sarah Mei
ce213513eb
PeopleController#update handles getting an empty string for :image
2010-10-31 17:49:47 -07:00
Sarah Mei
0817409e9a
Fixed deprecation warning
2010-10-31 17:48:38 -07:00
danielvincent
3cdb48232a
all box-shadows in views rendering in gecko
2010-10-31 17:29:23 -07:00
Michael Sofaer
82160d234a
Symlink the gems, too. This is probably crazy, but should work for now
2010-10-31 17:16:23 -07:00
Michael Sofaer
fd55a56235
Symlink the RVM wrapper scripts to /usr/local/bin
2010-10-31 17:02:22 -07:00
livefromthemoon@gmail.com
60f6e091d3
Added missing strings to french translation
2010-11-01 00:27:32 +01:00
Hexagon
cf6c2deba3
Added missing strings to swedish translation
2010-10-31 22:54:37 +01:00
danielvincent
3f7955f978
removed two unused methods
2010-10-31 14:50:14 -07:00
livefromthemoon@gmail.com
bbd0d35070
Fix some bugs for I18n fallbacks
2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
9e27797092
Fallback to default language when a translation is missing for the current language
2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
cf82a0a9c8
Better to set the default locale in an initializer than in a before_filter
2010-10-31 22:39:54 +01:00
danielvincent
bfb132280a
reshare button displays dropdown on click
2010-10-31 14:30:03 -07:00
danielvincent
dc330012d6
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-31 12:35:56 -07:00
danielvincent
b08c4fb84e
removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)
2010-10-31 12:34:26 -07:00
J David Eisenberg
f54820f456
Issue #496 : Eliminate self-links in Getting Started
2010-10-31 12:16:07 -07:00
Alec Leamas
8bd131e41c
Merge branch 'pkg-refactor'
2010-10-31 13:55:50 +01:00
Alec Leamas
c07771b390
bugfix
2010-10-31 13:55:33 +01:00
Alec Leamas
34abc18ebc
Merge branch 'pkg-refactor'
2010-10-31 13:20:29 +01:00
Alec Leamas
21772842be
bugfixes
2010-10-31 13:20:00 +01:00
Abdulaziz Al-Shetwi
96906d9eaf
Retranslate arabic localization.
2010-10-31 14:14:48 +03:00
Derrick Camerino
b19cdf2e25
fixing N socketing bug
2010-10-31 03:15:58 -07:00
J David Eisenberg
14ccf7229b
Issue #492 : Informal, vague description when signing up as a new user
2010-10-30 22:07:37 -07:00
Alec Leamas
220298ddd9
Merge branch 'pkg-refactor'
2010-10-31 01:39:15 +02:00
Alec Leamas
68d2f4162e
bugfix
2010-10-31 01:38:48 +02:00
Sarah Mei
07c216f31b
Putting the jasmine back in CI - changing selenium to be an external process.
2010-10-30 16:31:36 -07:00
Alec Leamas
f37b0f8f07
Merge branch 'pkg-refactor'
...
Conflicts:
pkg/ubuntu/dist
2010-10-31 00:05:24 +02:00
Alec Leamas
205a0a69f2
Hlding dist dirs in rep
2010-10-31 00:02:06 +02:00
Sarah Mei
2268cd204c
Taking jasmine out of CI for now - selenium server isn't reliably starting up during jasmine:ci
2010-10-30 13:52:52 -07:00
Alec Leamas
50b52af11a
bugfix,docs
2010-10-30 21:37:45 +02:00
Alec Leamas
814041d771
bugfix
2010-10-30 21:27:07 +02:00
Alec Leamas
2a3ea8b8e6
bugfix
2010-10-30 21:25:05 +02:00
Alec Leamas
6c25b02216
bugfix
2010-10-30 21:21:10 +02:00
Alec Leamas
42e8c8f11b
Raw code
2010-10-30 21:16:37 +02:00
Sarah Mei
08a70e4980
Moved default rake task to default.rake. Now runs cucumber, rspec, and jasmine.
2010-10-30 11:51:54 -07:00
Sarah Mei
3bd3a63c5d
Enough jasmine specs to get us started.
2010-10-30 11:48:17 -07:00
Sarah Mei
d0446aa316
require => false on jasmine to get rid of warnings
2010-10-30 10:58:32 -07:00
livefromthemoon@gmail.com
bcb17aae16
Add support for markdown links
2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
ebf9dd464f
Better support for imbricated markdown emphasis
2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
112088ace3
add support for markdown emphasis in status messages
2010-10-30 19:26:11 +02:00
Alec Leamas
b913444f2a
Merge remote branch 'upstream/master'
2010-10-30 18:13:44 +02:00
Alec Leamas
d572f8fafc
Packaging update
...
Handle git gems by cloning repo to local one, rewriting Gemfile
urls and sending both repos and gems in source packages.
Separate doc dir w licensec.
Gemfile, Gemfile.lock now lives in bundle, linked to application.
Rewrite http git urls to git: to make it uniform & simpler
2010-10-30 18:03:14 +02:00
Alec Leamas
04984d576a
bugfix
2010-10-30 15:48:33 +02:00
