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

2569 commits

Author SHA1 Message Date
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
e021fd821d Merge pull request #3362 from diaspora/non-public-error-page 
show a "post is not public" message when visitor is not logged in
 2012-06-11 02:35:48 -07:00
Adrián Chaves Fernández (Gallaecio)
994ece57f5 Updated Galician (gl) translation. 2012-06-10 12:57:09 +02:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Florian Staudacher
09cf60f794 use File.join when it's already there 2012-06-07 21:19:41 +02:00
Jonne Haß
46a01664bb fix minor typo: eliminate double spaces [ci skip] 2012-06-05 19:07:44 +02:00
Maxwell Salzberg
9071540400 use pod name helper in emails 2012-06-04 14:04:39 -07:00
Maxwell Salzberg
64bf4a1f48 adding the ability to customize your open graph namespace 2012-06-01 17:31:34 -07:00
Jonne Haß
2773694ba3 minor spelling fix [ci skip] 2012-06-01 23:02:56 +02:00
Jonne Haß
0592eb025e updated 14 locale files [ci skip] 2012-05-31 17:22:58 +02:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577 add a podname app config var, and use it throughout the app 2012-05-30 12:11:59 -07:00
Maxwell Salzberg
234bb4cb56 Merge pull request #3302 from movilla/new_login 
Translation new make something /stream [ci skip]
 2012-05-29 11:45:24 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
fechterjm
4011ac4ba4 ## their stream and get news about Diaspora, but if you don't want 
## your server to contact joindiaspora.com, set this to false:

should be

## their stream and get news about Diaspora, but if you want
## your server to contact joindiaspora.com, set this to false:
 2012-05-27 13:01:15 -03:00
Jonne Haß
2d39788ba3 updated 34 locale files [ci skip] 2012-05-25 23:34:31 +02:00
Hans Fase
5f38486ab8 Reverted "NewHere" camel-case. Looks like someone awesome fixed the problem. ;) 2012-05-24 23:54:04 -03:00
Maxwell Salzberg
75277b4d0e gzip outgoing stuffs for great success 2012-05-24 13:02:20 -07:00
Maxwell Salzberg
980ec78b7b fix piwki loading [ci skip] 2012-05-23 11:03:02 -07:00
movilla
a7f967c2c5 Translation new make something /stream 2012-05-23 00:43:45 +02:00
Jonne Haß
0030788a2c make pt-PT available [ci skip] 2012-05-22 17:57:25 +02:00
Jonne Haß
5c534521cc top level email is a noun, not a verb [ci skip] 2012-05-22 10:26:21 +02:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Hans Fase
04c3187f4f Changed NewHere to lowercase. Otherwise posts will not show up in stream! > https://github.com/diaspora/diaspora/issues/3237 2012-05-21 03:13:46 -03:00
Jonne Haß
ccf3bc36f2 updated 20 locale files [ci skip] 2012-05-20 00:36:31 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
20a63e3497 make the jquery can default to false in development and test so test can run offline [ci skip] 2012-05-17 18:50:51 -07:00
Maxwell Salzberg
a6758c0832 Merge pull request #3264 from movilla/share_amparito 
Translation invitation Share this link /stream [ci skip]
 2012-05-16 17:48:14 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
Maxwell Salzberg
143df27e5a redirect old atom.xml :( [ci skip] 2012-05-16 14:48:01 -07:00
danielgrippi
08fddf7422 raise on hotlinking [ci skip] 2012-05-16 14:41:09 -07:00
movilla
d394272e5d Translation invitation Share this link /stream 2012-05-16 00:56:34 +02:00
Maxwell Salzberg
4d9df0ec25 Merge pull request #3263 from movilla/stats_amparito2 
[Rebase] Add translation app/views/admins/stats.html.haml for Admin Panel [ci skip]
 2012-05-15 15:52:39 -07:00
danielgrippi
d7a099dadb add publish_actions to facebook connection [ci skip] 2012-05-15 14:07:34 -07:00
Maxwell Salzberg
900067ba1e disable the mass assignment thing until we deal with it [ci skip] 2012-05-15 13:35:22 -07:00
Movilla
a3daa00a41 Rebase Add translation app/views/admins/stats.html.haml for Admin Panel 2012-05-15 22:27:08 +02:00
Jonne Haß
9950342599 updated locales [ci skip] 2012-05-15 17:09:13 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Maxwell Salzberg
ad6151c808 Revert "@joshsusser hates our ci setup, /cc @suss" 
This reverts commit cbca19b3f5.
 2012-05-14 15:59:06 -07:00
Maxwell Salzberg
7a6633e82a Merge pull request #3256 from SuperTux88/invitation-mail 
Invitation mail cleanup
 2012-05-14 15:38:43 -07:00
Maxwell Salzberg
9d20f66d2f Merge pull request #3252 from movilla/regis_tra 
Translation registrations/new [ci skip]
 2012-05-14 15:18:52 -07:00
Benjamin Neff
5db6604d79 remove old invite_code_url from locales 2012-05-13 03:21:56 +02:00
Benjamin Neff
9abfb6a266 make invite url clickable 2012-05-13 03:17:16 +02:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
movilla
7538f89a95 Translation registrations/new 2012-05-12 22:18:10 +02:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
danielgrippi
608a15faf4 the landing page. 2012-05-11 01:06:51 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00