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
Hexagon
bba3aaa684
Translating a huge amount of untranslated strings
2010-10-30 15:25:42 +02:00
Hexagon
0bef839261
Translating a huge amount of untranslated strings
2010-10-30 15:24:26 +02:00
Alec Leamas
668da620f1
bugfix
2010-10-30 13:34:45 +02:00
Alec Leamas
625bd428a1
bugfixes. Rewrite http: github path to git:
2010-10-30 13:18:56 +02:00
Alec Leamas
a3625bc399
Merge remote branch 'upstream/master'
2010-10-30 11:35:20 +02:00
Alec Leamas
58ead768d6
Small fix
2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98
Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2
2010-10-30 09:54:28 +02:00
Sarah Mei
3fd198d1bc
mongrel doesn't build under 1.9
2010-10-29 22:35:33 -07:00
Sarah Mei
d819c98718
can haz working jasmine
2010-10-29 22:21:08 -07:00
Himanshu Chhetri
4db521657d
Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion.
2010-10-29 20:31:45 -07:00
Sarah Mei
07a54fea04
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 20:27:33 -07:00
Sarah Mei
f04634c415
Don't need to remove Gemfile.lock for 1.8.7 build
2010-10-29 20:27:26 -07:00
Alec Leamas
de06f43d26
bugfix
2010-10-30 06:11:27 +03:00
Raphael
ccf3b7d87b
stub out some stuff in publics_controller
2010-10-29 19:10:29 -07:00
Sarah Mei
53dbff42ad
CI creates gemset if it doesn't exist
...
CI 1.8.7 build uses REE
2010-10-29 19:08:47 -07:00
Raphael
f7708fb9bf
Get rid of deprecation warning
2010-10-29 18:55:30 -07:00
Raphael
49e1bde150
Stub user creation in registrations_controller
2010-10-29 18:46:57 -07:00
Raphael
bc5dc934d6
Speed up importer spec by 40 seconds
2010-10-29 18:08:36 -07:00
Raphael
5f85cf2588
Simplifying validations a little
2010-10-29 17:26:28 -07:00
Raphael
05cd57b02c
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 16:56:40 -07:00
Raphael
555c15dfef
Simplify validations on user
2010-10-29 16:56:04 -07:00
danielvincent
5a9bfa7405
DG IZ; post senders are now verified by diaspora handles
2010-10-29 16:49:59 -07:00
Hexagon
99661a3240
Added swedish translations
2010-10-30 01:32:32 +02:00
maxwell
15bd24a64f
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/lib/message_handler_spec.rb
spec/spec_helper.rb
2010-10-29 16:23:33 -07:00
maxwell
c1c045a4cd
mocking
2010-10-29 16:21:39 -07:00
Raphael
581985990c
Delete no-longer-relevant spec, now down to master branch failures
2010-10-29 15:59:42 -07:00
Raphael
99eb25762d
Moving to make_user, a few specs broken
2010-10-29 15:53:21 -07:00
Raphael
5b78a31d29
make_user now makes a user from fixtures
2010-10-29 15:53:21 -07:00
Raphael
0c434ff66a
rake task to generate user fixtures, helper method which saves them
2010-10-29 15:53:21 -07:00
