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

2083 commits

Author SHA1 Message Date
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
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Maxwell Salzberg
95ad709324 change that profile url to something I like slightly better 2011-09-24 23:44:21 -07:00
Maxwell Salzberg
049eb74ab2 added route to grab users profile picture if you know their username 2011-09-24 23:33:14 -07:00
Jonne Hass
6ffcec0885 updated 53 locale files [ci skip] 2011-09-24 21:08:18 +02:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Raphael Sofaer
2e96f0121e simplify multi-server spec running with foreman. couldn't really get it automated tonight, not sure why. 2011-09-22 00:24:01 -04:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Sarah Mei
346e1f1c87 SPELL CHECK PLZ. 2011-09-20 21:56:17 -07:00
Loïc Guitaut
fe8fb9ff31 Added task to capistrano to copy assets of resque-web (fixed) 2011-09-20 23:31:56 +02:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Jonne Hass
70c2fda2ca Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-09-20 18:42:56 +02:00
Sarah Mei
3a9d8f0f38 ARRRGGGHH *twitch* *twitch* 2011-09-19 22:00:00 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
Jonne Hass
473642234d updated locales and pulled in NN 2011-09-19 15:36:12 +02:00
Jordi Mallach
ff5919f43f Change "Click this link" to "Follow this link". 
As discussed with @rsofaer in 9797e04957,
"follow" is more device-neutral, better for mobile browser users.
 2011-09-18 22:46:31 +02:00
Jordi Mallach
d006ca9850 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-09-18 03:21:57 +02:00
Jonne Hass
661d5d3bbc pull in ur-PK 2011-09-18 00:56:04 +02:00
Jordi Mallach
98aa2a0196 Update Catalan translation to 91e6499. 2011-09-17 21:50:37 +02:00
Jordi Mallach
021f704de7 Add trailing dot. 2011-09-17 21:47:57 +02:00
Jonne Hass
d498110b3d updated 117 locale files [ci skip] 2011-09-17 17:32:01 +02:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
17b5e7b066 move admin rack to its own file 2011-09-16 13:33:05 -07:00
Jonne Hass
7ab963f859 whoops, fix my typo 2011-09-16 22:27:19 +02:00
Jonne Hass
b706edf76f pull in parallel_testing to speed up rspec 
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
 2011-09-16 22:14:12 +02:00
Jonne Hass
fcff5a6774 do not break on not updated application.yml for mount_resque_web 2011-09-16 22:03:38 +02:00
Maxwell Salzberg
55999bc443 resolve route conflicts 2011-09-16 12:49:47 -07:00
Ilya Zhitomirskiy
f1a8b1fd6f added the namespace constraint back to the envelope, protocol route, data type is now plain xml 2011-09-16 08:53:13 -07:00
Loïc Guitaut
a739c4f308 Ability to mount resque jobs monitoring directly into Diaspora* routes 
As resque-web is considered as a debug tool, route is disabled for
production by default, and can be enabled via the `mount_resque_web` key
in application.yml.
 2011-09-16 02:40:57 +02:00
danielgrippi
3f84dd066f can't access git on heroku 2011-09-14 18:07:54 -07:00
danielgrippi
084ed0e838 dont tell faraday to get a custom ca file, hopefully heroku does magic to make sure they work 2011-09-14 18:07:53 -07:00
danielgrippi
c1b46e557f added redis to go support in redis 2011-09-14 18:07:53 -07:00
Jonne Hass
70a9f3fd94 made openssl verify mode configurable for SMTP 2011-09-14 20:55:29 +02:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Jonne Hass
d7a7154424 Revert "lets set the example collation to utf8_general_ci instead of utf8_bin, #1395" 
This reverts commit eb85cdab5b.
 2011-09-14 14:01:53 +02:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00
Jonne Hass
10df8ef2c8 updated 6 locale files [ci skip] 2011-09-14 00:43:19 +02:00
Jonne Hass
cecd6ca5a1 Lets take another try at a consistent single process mode handling 
Revert "dont call settingslogic single process mode, use the hash accessor so it is not required"

This reverts commit 57de976396.
 2011-09-13 22:29:56 +02:00
Jonne Hass
eb85cdab5b lets set the example collation to utf8_general_ci instead of utf8_bin, #1395 2011-09-13 17:45:53 +02:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
Jonne Hass
5ae96efdf6 fix oauth keys, deep_merge vs deep_merge! my bad 2011-09-12 22:28:13 +02:00
Maxwell Salzberg
57de976396 dont call settingslogic single process mode, use the hash accessor so it is not required 2011-09-12 08:42:38 -07:00
Jonne Hass
37787605aa updated 44 locale files [ci skip] 2011-09-12 00:00:58 +02:00
Jonne Hass
41effa7bd2 load oauth_keys.yml.example as default so I don't have to touch my oauth_keys.yml to have the specs pass on my machine 2011-09-11 23:45:14 +02:00
Jonne Hass
96fc057974 correct Rails.logger call in resque initializer 2011-09-11 22:07:54 +02:00
Lennart Prelle
40ac7b7620 make string in authorizations translateable 2011-09-11 17:20:54 +02:00
Jonne Hass
cce2ab2151 cleaned up application.yml.example 2011-09-11 14:45:47 +02:00
Jonne Hass
bdd6b9127a overlooked one last old single process check 2011-09-11 14:19:26 +02:00
Jonne Hass
a614985d83 made single process mode configuration more consistent 
* SINGLE_PROCESS_MODE environment variable takes precedence over
  application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
  SINGLE_PROCESS_MODE environment variable to be backward compatible
 2011-09-11 13:54:14 +02:00
Jonne Hass
79a8ab709f updated 77 locales [ci skip] 2011-09-11 03:20:59 +02:00
Maxwell Salzberg
1fa01a811e DG MS; updated text to reflect the fact that hiding posts now 
mutes notifications as well
 2011-09-09 10:52:19 -07:00
Maxwell Salzberg
328269e40d re-added single process mode to the example 2011-09-09 10:10:10 -07:00