Alec Leamas
818ccf92b0
Bugfix (only visible on Ubuntu)
2010-12-06 18:18:49 +01:00
Alec Leamas
4926e185ef
Making jammit tests in server consistent
2010-12-06 15:32:01 +01:00
Alec Leamas
521aa83b0c
Create publiuc/source.tar.gz from current branch.
...
Also, give slow starters some more time.
2010-12-06 15:22:43 +01:00
Alec Leamas
36e6c9f68e
Revert "Fixing server when no git files, not on master"
...
Wrong usecase. The real problem is always using the master branch.
There is no point using a files list, distributions will just
create the tar archive in advance.
This reverts commit 0541082804
2010-12-06 14:49:32 +01:00
Alec Leamas
7aa7c29b46
Route redis output to log file,
...
On Fedora, logfile/loglevel in configuration file seems to be ignored
as of now.
2010-12-06 13:38:08 +01:00
Alec Leamas
0541082804
Fixing server when no git files, not on master
...
Allows server to run even if on another branch than master and/or
in a production scenario without git files available.
2010-12-06 13:36:24 +01:00
maxwell
9bc8934970
add test mode to emailer
2010-12-05 18:06:54 -08:00
danielvincent
460081bc2f
don't condense comments on show pages
2010-12-05 17:21:57 -08:00
Raphael
3ef5ac5252
Add some specs to Invitation, use I18n in InvitationsController
2010-12-05 14:37:43 -08:00
Raphael
4b1c36ca04
Timestamp services
2010-12-05 14:37:00 -08:00
Raphael
5a5bd13ceb
Take out extra person.save
2010-12-05 12:46:05 -08:00
MrZYX
6a4351378b
fixed bug in the mailer that caused a invalid To: header in the mail
2010-12-05 20:48:18 +01:00
MrZYX
4df13d56e1
made that latest change translatable
2010-12-05 16:02:52 +01:00
MrZYX
b84b6ea9e4
some fixes to translations
2010-12-05 16:02:52 +01:00
MrZYX
81fd4b6992
updated locales from the rails i18n project
2010-12-05 14:24:00 +01:00
danielvincent
e9742acc32
reverting http_post to a working state
2010-12-05 02:08:29 -08:00
danielvincent
d7407b7aa6
request -> resource
2010-12-05 02:03:03 -08:00
danielvincent
737e6084df
actually setting the timeout in restclient
2010-12-05 01:54:16 -08:00
Sarah Mei
ecc537c737
Stub Jobs::ReceiveSalmon.perform in controller test
2010-12-05 01:31:19 -08:00
danielvincent
648614aea5
add 4 sec timeout to restclient
2010-12-05 01:26:31 -08:00
maxwell
53b38a3bca
fixing p-controller for real
2010-12-05 00:52:45 -08:00
maxwell
65c22020e8
fixing photo controllers spec
2010-12-05 00:45:13 -08:00
maxwell
2c09c35425
MS DG photos now delete sm if they are empty status messages, and status messages delete their photos
2010-12-05 00:45:13 -08:00
maxwell
a415ff5c5f
fixed the build. made photos dependent destroy with parent status message
2010-12-05 00:45:13 -08:00
Raphael
cc3db3d2f3
Uhh...
2010-12-05 00:20:46 -08:00
Raphael
c320dae589
Add a cuke for being invited by someone
2010-12-05 00:15:37 -08:00
Raphael
36e1fb8b2c
Fix a couple local-posting specs
2010-12-04 23:38:31 -08:00
Raphael
c99796f5db
Extra spec on find_for_authentication
2010-12-04 23:15:22 -08:00
Raphael
c09c060ebb
Beginning of user invitation acceptance feature
2010-12-04 23:07:52 -08:00
maxwell
03a5514400
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 23:06:58 -08:00
maxwell
0a8af9e72b
DG MS some fixes for getting started
2010-12-04 23:05:47 -08:00
OhaiBBQ
4bbbbf6bb1
tipsy on sidebar avatars
2010-12-05 09:44:10 +03:00
Raphael
61e40debb5
Fix in find_for_authentication
2010-12-04 22:25:28 -08:00
maxwell
23c446c8bf
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 21:57:55 -08:00
Sarah Mei
9da69a4b01
Mobile log in form is usable. Also, added mixins for sass.
2010-12-04 20:45:52 -08:00
danielvincent
03961bce7b
removed last reference to invitation fancybox
2010-12-04 20:06:24 -08:00
maxwell
fb310560df
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 19:37:47 -08:00
Michael Sofaer
9e575ea765
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
2010-12-04 19:36:22 -08:00
danielvincent
4c4f5c6aa4
dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.
2010-12-04 19:36:22 -08:00
maxwell
68e7fdf6b7
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 19:34:14 -08:00
maxwell
b56b2fbd1b
added spec for periods in usernames; unpendify a couple of specs
2010-12-04 19:33:58 -08:00
Sarah Mei
fea6884acc
Mobile homepage looks decent.
2010-12-04 19:30:14 -08:00
maxwell
b3ca504c40
no periods in username
2010-12-04 19:28:08 -08:00
OhaiBBQ
1b7749f282
typo on last commit
2010-12-05 06:21:06 +03:00
OhaiBBQ
05f54e0ebd
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-05 06:18:30 +03:00
OhaiBBQ
78ac693dcd
only tipsy on avatars in left_pane and manage_aspect_zone
2010-12-05 06:17:14 +03:00
Sarah Mei
06cc99b19e
git ignores mobile.css
2010-12-04 19:16:14 -08:00
Sarah Mei
c3736729c9
removing mobile.css from git
2010-12-04 19:16:14 -08:00
danielvincent
c4db32c253
adding jquery 1.4.4 back re sentientwaffle's fix.
2010-12-04 18:59:01 -08:00
sentientwaffle
b303cf6830
fixed issue with post deletion confirmation for the latest verison of jquery
2010-12-04 18:55:15 -08:00
