zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
zhitomirskiyi
|
c8c0b5c8a2
|
made the service image the same size
|
2010-11-18 15:22:14 -08:00 |
|
maxwell
|
cb23fd495b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 15:18:07 -08:00 |
|
maxwell
|
970d56a007
|
basic batch inviter
|
2010-11-18 15:17:22 -08:00 |
|
Raphael
|
22aa0d3f26
|
Updating Gemfile.locl
|
2010-11-18 15:14:01 -08:00 |
|
MrZYX
|
dcbcaefcbe
|
added language codes map
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
60375422e7
|
pulled update for sk.yml from the rails i18n project
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
3f76699805
|
pulled update for et.yml from rails i18n
|
2010-11-18 15:13:30 -08:00 |
|
MrZYX
|
13ca682734
|
added locales from the rails-i18n project, removed rails-i18n parts from existing locales, added script to update rails-i18n locales
|
2010-11-18 15:13:30 -08:00 |
|
Raphael
|
61692c1da6
|
Fix translation missing in inv mailer
|
2010-11-18 12:50:46 -08:00 |
|
maxwell
|
8c092649f2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 12:37:02 -08:00 |
|
maxwell
|
585ab020f8
|
move back to magent master
|
2010-11-18 12:36:47 -08:00 |
|
zhitomirskiyi
|
f95fd33ed4
|
typo
|
2010-11-18 12:22:39 -08:00 |
|
zhitomirskiyi
|
9a31d15c92
|
added icons for the connected services and to indicate the rss feed
|
2010-11-18 12:19:58 -08:00 |
|
Raphael
|
187e9ac198
|
Merge remote branch 'jandom/475-Chore-Add-missing-polish-locales'
|
2010-11-18 11:59:55 -08:00 |
|
Raphael
|
c564d2819e
|
Fixing no contacts link in _no_contacts. Thanks to alepane21.
|
2010-11-18 11:55:03 -08:00 |
|
Raphael
|
589c36d1ed
|
Merge remote branch 'hex/duplicate-ids'
|
2010-11-18 11:39:03 -08:00 |
|
Raphael
|
be55384628
|
Add pending spec to invitations
|
2010-11-18 11:21:35 -08:00 |
|
Raphael
|
47dc91fae4
|
Make link to getting started page in cucumber feature work
|
2010-11-18 11:16:18 -08:00 |
|
Matt Baker
|
b2e6caafed
|
Don't show skip link if user.getting_started == false
|
2010-11-18 11:16:18 -08:00 |
|
maxwell
|
597258615b
|
adding star back to title
|
2010-11-18 11:06:17 -08:00 |
|
maxwell
|
3b88121244
|
dammit jammit... dont package always dur
|
2010-11-18 09:24:01 -08:00 |
|
Alec Leamas
|
4599f700e6
|
Show error cause in websocket_server, trailing blanks.
Related to, but does not solve http://bugs.joindiaspora.com/issues/540.
|
2010-11-18 14:51:47 +01:00 |
|
maxwell
|
9882fa183d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 23:19:27 -08:00 |
|
maxwell
|
2ffd2d93e3
|
made mailchimp form ssl
|
2010-11-17 23:19:12 -08:00 |
|
danielvincent
|
b8e04d4888
|
rescue jammit if java isn't installed on the system. server will continue starting normally if this is the case.
|
2010-11-17 23:00:40 -08:00 |
|
Sarah Mei
|
d1a745c9cd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:42:04 -08:00 |
|
danielvincent
|
eda346e283
|
use google's jquery within current protocol (http/https)
|
2010-11-17 22:36:01 -08:00 |
|
Sarah Mei
|
64237534fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:31:21 -08:00 |
|
Sarah Mei
|
c19ebcece3
|
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
|
2010-11-17 22:28:24 -08:00 |
|
maxwell
|
f01fca1877
|
letting jammit do its default thing
|
2010-11-17 22:18:15 -08:00 |
|
maxwell
|
5e375a30d8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:06:08 -08:00 |
|
maxwell
|
c6778b942f
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/layouts/application.html.haml
|
2010-11-17 21:57:48 -08:00 |
|
danielvincent
|
558c175c2b
|
resolved translation issue in diaspora.en in user dropdown. second login link on landing page works.
|
2010-11-17 21:57:27 -08:00 |
|
maxwell
|
31d33054ef
|
added jammit, now js and css compress for production
|
2010-11-17 21:51:59 -08:00 |
|
zhitomirskiyi
|
af6185294e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 21:38:28 -08:00 |
|
zhitomirskiyi
|
c3f65d45a1
|
added nginx logging
|
2010-11-17 21:35:13 -08:00 |
|
Sarah Mei
|
2949dd8796
|
cucumber feature for accepting a contact request.
|
2010-11-17 21:34:47 -08:00 |
|
danielvincent
|
9041a81fea
|
cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing
|
2010-11-17 21:21:00 -08:00 |
|
Raphael
|
ea25b28c5c
|
refactor splunk recipe
|
2010-11-17 21:18:43 -08:00 |
|
maxwell
|
3db8da992a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 20:14:12 -08:00 |
|
maxwell
|
c08a991130
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 20:14:00 -08:00 |
|
danielvincent
|
1a9041a3c0
|
DG MS; fixed cucumber tests to work with new landing page flow
|
2010-11-17 19:49:01 -08:00 |
|
danielvincent
|
056dc7d3ba
|
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
|
2010-11-17 19:37:08 -08:00 |
|
danielvincent
|
a7c1733093
|
firefox fixes and added links to press articles on landing page
|
2010-11-17 19:37:08 -08:00 |
|
danielvincent
|
f59f6be4b0
|
users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.
|
2010-11-17 19:37:08 -08:00 |
|
Raphael
|
37a694ed1f
|
Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects
|
2010-11-17 18:49:03 -08:00 |
|
Raphael
|
cb23ed1136
|
typo
|
2010-11-17 18:49:03 -08:00 |
|
maxwell
|
1a279de573
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 16:18:07 -08:00 |
|
maxwell
|
f442c6fe3e
|
taking out the if true
|
2010-11-17 16:17:52 -08:00 |
|