nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9656 commits 4 branches 0 tags 121 MiB
Commit graph

2042 commits

Author SHA1 Message Date
Maxwell Salzberg
08bbce90a9 increase timeout on jobs to see if that helps 2011-10-24 16:01:13 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
d97d524a7b attempting to tell excon about certs f cent-os 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Jordi Mallach
f12d9b56a7 Avoid using “has just” constructs, as discussed in ddd152505e. 
Fix grammar for plurals for mentions and reshares, too.
 2011-10-23 20:35:28 +02:00
Jordi Mallach
84bd00577d Update Catalan translation of devise to fe78a69. 2011-10-23 20:18:01 +02:00
Jordi Mallach
89f5f6e727 Update Catalan translation to ddd1525. 2011-10-23 20:10:26 +02:00
Jordi Mallach
bfae64d805 Fix grammar for the singular case. 2011-10-23 20:08:11 +02:00
Jonne Hass
e643e8491f updated 55 locale files [ci skip] 2011-10-23 15:34:56 +02:00
Gonzalo Rodriguez
ddd152505e Fix like notification message grammar. Fixes #2222. 2011-10-23 05:17:33 -02:00
Justin Thomas
f18846bf92 communtiy is community 2011-10-22 19:17:00 -07:00
danielgrippi
7577ad4e81 deprication support for featured_users key in application.yml. 2011-10-21 17:45:06 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Jonne Hass
2141496014 updated 57 locale files [ci skip] 2011-10-18 20:40:44 +02:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Sarah Mei
98ef5212f3 Merge branch 'tag_stream_api' 2011-10-16 15:47:20 -07:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
58d496e146 MS SM WIP 2011-10-15 22:11:23 -07:00
Maxwell Salzberg
8029cb0784 SM MS basic api wip. able to get a users public profile 2011-10-15 18:57:13 -07:00
Jonne Hass
4e17df17fc Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-15 15:06:11 +02:00
Jonne Hass
eb20f7e2f8 updated 84 locale files [ci skip] 2011-10-15 15:06:06 +02:00
Jordi Mallach
01aecabfae Update Catalan translation to 01d7b95. 2011-10-15 13:44:50 +02:00
danielgrippi
ce309ebad3 update application.yml.example to reflect redis cache changes 2011-10-14 15:49:06 -07:00
Maxwell Salzberg
01d7b9507b DG MS; ajax in the soup 2011-10-14 11:17:25 -07:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Gonzalo
12ddf00e16 Merge pull request #2165 from Pistos/issue-2136-wrong-aspect-button-text 
Issue 2136 wrong aspect button text
 2011-10-12 18:47:27 -07:00
Ilya Zhitomirskiy
d5d4b9d555 Merge pull request #2145 from bagilevi/fix-omniauth-rack-bug-1824 
Fixes omniauth & rack-1.2 bug #1824
 2011-10-12 16:13:51 -07:00
Daniel Grippi
238e106267 Merge pull request #2012 from Flink/deploy-resque-assets-fixed 
Added task to capistrano to copy assets of resque-web (fixed)
 2011-10-12 16:10:30 -07:00
Pistos
1c543e3bea Fixed the issue without breaking the aspects dropdown on the [other] user profile page. 2011-10-12 09:51:30 -04:00
Pistos
e013e4103f Corrected English for button text when no aspects are selected in publisher. 2011-10-11 23:44:41 -04:00
Pistos
cc1fea92e6 Whitespace cleanup. 2011-10-11 23:44:28 -04:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
Jonne Hass
8bc67f983c Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-10-11 14:07:31 +02:00
Jonne Hass
6ff2bdd300 updated locales and added sq, uk and en_1337 2011-10-11 13:03:11 +02:00
Dan Hansen
71681d1bc7 load mail jobs in an initializer so Resque::Helper.constantize doesn't throw UninitializedConstant 
when resque tried to get the constant "Mail" from the "Jobs" module it got the inherited constant "Mail" (ruby gem) instead of Jobs::Mail
 2011-10-09 23:39:56 -05:00
Levente Bagi
6e60d932c0 Fixes omniauth & rack-1.2 bug #1824 
Rack 1.2's request.url method is buggy, as it gets the host part from
HTTP_X_FORWARDED_HOST, but the port from SERVER_PORT (which should be
used in conjuction with SERVER_ADDR).

This way, if the app is run behind a reverse proxy, it will create a
URL with <public_host>:<private port>, and pass this to Facebook,
so Facebook will redirect back to the URL with the wrong port.

Upgrading Rack requires upgrade to Rails 3.1.

This temporary solution configures OmniAuth using a copy of the newer
version of Rack::Request.
 2011-10-09 01:03:22 +01:00
Gonzalo Rodriguez
7994c4d43f 1 new notifications must be 1 new notification 2011-10-08 21:36:58 -02:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Your Name
b8984e7eaf didn't like my language 2011-10-06 15:52:30 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
fa58fbe272 Typo on english locale 2011-10-06 00:42:56 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Maxwell Salzberg
d91ea4b9ce adding support for message bus email service 2011-10-05 12:06:19 -07:00
Maxwell Salzberg
85e51a6dd7 wip 2011-10-05 12:06:19 -07:00
Jordi Mallach
3a62b10384 Updated Catalan translation to ad9dcd8. 2011-10-04 13:19:46 +02:00
Sarah Mei
ec1ae8c07e Aaaand now we need to install firefox too 2011-10-03 22:19:25 -05:00
Sarah Mei
f76aeb1b39 Apparently they forgot to install xvfb as well. 2011-10-03 22:06:23 -05:00
Sarah Mei
911d9094d8 Go back to copying in the /etc/init.d/xvfb script since the Travis workers apparently don't have it anymore. 2011-10-03 21:58:00 -05:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Pistos
9d8fdb4659 Added Gentoo's CA certs location to the comments in the example config. 2011-10-03 16:30:26 -04:00
Pistos
20f9ff8555 Whitespace cleanup. 2011-10-03 16:30:16 -04:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
Howard Lin
1ffb706946 User email lookup is now case insensitive 2011-10-01 19:50:39 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Maxwell Salzberg
5348c72209 add sqlite method; fix chubbies cukes 2011-09-30 14:27:54 -07:00
Paul Spieker
0c12471feb add username blacklist 2011-09-30 14:17:04 +02:00
Maxwell Salzberg
b27a8dd330 fix up info sidebar" 2011-09-29 12:51:00 -07:00
danielgrippi
6b73527379 vcuculo's fixes (flattened mobile.scss into mobile boilerplate's css instead of just flipping the load order) 2011-09-29 10:19:03 -07:00
Jonne Hass
68f15a8a34 fix ca.yml 2011-09-29 14:37:10 +02:00
Jonne Hass
a6977c55a2 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-09-29 14:35:12 +02:00
Jonne Hass
710f241b42 updated 21 locale files [ci skip] 2011-09-29 14:34:17 +02:00
Ilya Zhitomirskiy
1fe9de328b removing newrelic resque for now 2011-09-28 18:47:42 -07:00
Ilya Zhitomirskiy
1da0bf5d95 changed the load order for newrelic 2011-09-28 18:34:56 -07:00
Ilya Zhitomirskiy
95c8986b8e added new relic resque support 2011-09-28 17:53:29 -07:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
Jordi Mallach
2e86e9ece7 Fix a variable and add missing ellipsis. 2011-09-28 21:18:52 +02:00
Jordi Mallach
b712586ca3 Updated Catalan translation to d2d205e. 2011-09-28 21:11:10 +02:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
64113eb8f2 increment counter on comment add 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
Gonzalo Rodriguez
372a472fbf Empty aspect stream when no aspect selected on the left nav 2011-09-27 23:46:02 -03:00