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
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
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
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
Raphael
3d2dd073ea
Take diaspora_handle out of user
2010-10-29 15:52:54 -07:00
danielvincent
8ec49e685b
going to a non-friend's page contains a way to add them.
2010-10-29 15:43:44 -07:00
maxwell
a272b22208
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 15:16:17 -07:00
maxwell
3ce44d040f
mocking out emhttprequest everywhere
2010-10-29 15:16:11 -07:00
danielvincent
f2b7e4010e
edit profile link on owner's profile page.
2010-10-29 15:02:56 -07:00
danielvincent
7acc138a21
resolved issue regarding profile images referenced at https:// locations.
2010-10-29 14:56:41 -07:00
maxwell
4e2425cdef
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 14:26:20 -07:00
maxwell
7e7c4c3431
refactored message handler spec
2010-10-29 14:26:11 -07:00
danielvincent
6eb50ea934
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad
photo uploader on edit profile page.
2010-10-29 14:11:59 -07:00
Raphael
ce805c8167
Test pollution from locale being set
2010-10-29 13:26:54 -07:00
Raphael
86ddc2561a
fix spec in users_controller
2010-10-29 13:22:25 -07:00
maxwell
f75bd6bc2e
whoops, taking out queue stuff untill i finish
2010-10-29 13:05:35 -07:00
maxwell
242c6e4336
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 12:30:54 -07:00
maxwell
a7b3fc48ec
https is now a valid url for people. thx grippi
2010-10-29 12:30:38 -07:00
zhitomirskiyi
2c0a189df4
removed the session secret from the repo
2010-10-29 12:20:06 -07:00
maxwell
9c2ca15e93
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 12:09:32 -07:00
maxwell
c6fbcd28f7
stubbing out the hub publish method
2010-10-29 12:09:10 -07:00
Raphael
d753e31205
Merge remote branch 'ed0h/309-user-choose-language'
...
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
2010-10-29 12:06:14 -07:00
maxwell
47a9b2d189
switching deploy branch to master
2010-10-29 11:39:28 -07:00
maxwell
a5eb4bf1a7
Merge branch 'emw-merge'
2010-10-29 11:38:47 -07:00
maxwell
23db4fe278
merge complete
2010-10-29 11:33:31 -07:00
maxwell
39f66cc5d9
tests are green
2010-10-29 11:19:07 -07:00
maxwell
7c32649df4
rebasing master
2010-10-29 11:18:20 -07:00
maxwell
6d139ab946
more tests pass
2010-10-29 11:17:39 -07:00
maxwell
1e349e6a61
last time
2010-10-29 11:16:50 -07:00
maxwell
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
maxwell
b8a9025616
bad merge in receive
2010-10-29 11:16:11 -07:00
