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

12310 commits

This branch
This branch
All branches
Author SHA1 Message Date
Samuel Fawaz
7844264571 database configuration does not work when choosing PgSQL 2012-08-03 23:39:03 +02:00
Florian Staudacher
50eed641fe Merge pull request #3479 from movilla/little_translation 
little translation to send invitations
 2012-08-03 13:49:48 -07:00
Maxwell Salzberg
a841d3a839 derp, not everyone wants a cdn from google. if anyone who has this problem wants to fix it, you need to set cross origin headers for your fonts 
if they are hosted from another domain for FF to recognize them. You cant set said header on cloudfront. Revert "fix roboto in firefox""

This reverts commit e87d9af52c.
 2012-08-03 10:46:41 -07:00
movilla
ef1e4fa318 little translation to send invitations 2012-08-03 15:31:34 +02:00
Maxwell Salzberg
e87d9af52c fix roboto in firefox" 2012-08-02 23:01:05 -07:00
Dennis Schubert
15b7ee0cf8 Fix the bookmarklet when using paramters 
... because setting values without waiting for the browser to finish the DOM rendering is evil ...
 2012-07-26 23:57:28 +03:00
Florian Staudacher
b3554ec1aa Merge pull request #3469 from Raven24/master 
specs for #3464
 2012-07-25 06:45:18 -07:00
Florian Staudacher
c7f66ee647 add specs for #3464 2012-07-25 15:22:53 +02:00
Jonne Haß
87a091ced1 updated 25 locale files [ci skip] 2012-07-24 22:10:39 +02:00
Maxwell Salzberg
0dfbe4bfcb Merge pull request #3466 from Raven24/toggle-footer-link 
let the 'toggle mobile' link show in the footer
 2012-07-22 21:57:11 -07:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
Florian Staudacher
9bd7c6965f Merge pull request #3464 from Raven24/invite-auth 
require authentication for invite actions
 2012-07-22 04:06:44 -07:00
Florian Staudacher
b585a02c0b Merge pull request #3465 from movilla/master 
Link to post in the mobile
 2012-07-22 04:03:35 -07:00
movilla
d45e53bb91 Link to post in the mobile 2012-07-22 13:32:02 +03:00
Florian Staudacher
fd6d41ddad require authentication for invite actions 2012-07-22 02:42:39 +02:00
Florian Staudacher
629277502f Merge pull request #3450 from despora/mobile_messages 
add messages/conversations to mobile
 2012-07-16 15:10:00 -07:00
Maxwell Salzberg
bc478efe7a Merge pull request #3453 from Raven24/flash-fix 
fix flash messages
 2012-07-15 11:08:01 -07:00
Florian Staudacher
6efcac48b5 fix flash messages 2012-07-15 19:33:32 +02:00
Lennart Prelle
00032a1649 add messages to mobile 2012-07-14 14:23:03 +02:00
Jonne Haß
ec7ae5c2c9 fix gl locale 2012-07-12 13:18:12 +02:00
Jonne Haß
98d70d3be3 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-07-12 13:11:28 +02:00
Jonne Haß
6f5929c50f updated 6 locale files [ci skip] 2012-07-12 13:11:21 +02:00
Jordi Mallach
049c5e602e Catalan translation updated to 8c8ff1f. 2012-07-12 13:05:03 +02:00
Jordi Mallach
05eccde08e Update Catalan translation to 8c8ff1f. 2012-07-12 12:54:34 +02:00
Florian Staudacher
244bf65ba7 Merge pull request #3446 from jaywink/3204-mobile_bookmarklet_fix 
Fix for #3204 Mobile bookmark not working
 2012-07-11 02:26:17 -07:00
Jason Robinson
e644a70406 Mobile bookmarklet was not loading jQuery causing javascript to not execute, fixes #3204 2012-07-10 23:06:42 +03:00
Florian Staudacher
9e765cda18 Merge pull request #3444 from Raven24/update-mentions 
update jquery.mentionsInput to latest version
use unminified jQuery.textchange
 2012-07-10 12:51:30 -07:00
Florian Staudacher
038599bf8f update jquery.mentionsInput to latest version 
+ make some tests a little nicer
 2012-07-10 20:37:57 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
Jonne Haß
47412a39e7 Merge pull request #3442 from Gallaecio/l10n-gl 
Updated the Galician (gl) translation.
 2012-07-08 08:06:50 -07:00
Adrián Chaves Fernández (Gallaecio)
17c4370894 Updated the Galician (gl) translation. 2012-07-08 14:58:58 +02:00
Jonne Haß
24f406073c updated 16 locale files [ci skip] 2012-07-08 01:53:03 +02:00
Maxwell Salzberg
a59320c937 Merge pull request #3441 from movilla/master 
Fix error admins/weekly_user_stats
 2012-07-07 13:23:54 -07:00
movilla
5eab1226f6 Fix error admins/weekly_user_stats 2012-07-07 22:33:56 +03:00
Maxwell Salzberg
0ca2bfa84d Merge pull request #3436 from L2G/master 
Clarify warning shown when single_process_mode used in production
 2012-07-06 12:29:18 -07:00
Maxwell Salzberg
8763450cfb Merge pull request #3440 from movilla/master 
Change root_url to root_path
 2012-07-06 12:27:49 -07:00
movilla
2ff89ed33d Change root_url to root_path 2012-07-06 20:08:41 +03:00
Florian Staudacher
88e15ed4db Merge pull request #3434 from Raven24/fix-tag-cleanup 
make the rake task for cleaning up mixed-case tags more verbose
 2012-07-06 04:24:35 -07:00
Lawrence Leonard "Larry" Gilbert
37b6045c04 Clarify warning shown when single_process_mode used in production 2012-07-04 18:02:40 -07:00
Florian Staudacher
f9b54b5c10 make the rake task for cleaning up mixed-case tags more verbose [ci skip] 2012-07-04 22:43:43 +02:00
Florian Staudacher
a0e69b4374 Merge pull request #3433 from Raven24/fix-mobile-toggle 
fix some mobile/tablet related stuff
 2012-07-04 03:00:44 -07:00
Florian Staudacher
1809897aa2 should fix the mobile toggle for the case: desktop --to--> mobile #3299 
also, (possibly) fix tablet issue #3421, + tests
 2012-07-04 01:47:55 +02:00
Florian Staudacher
6868d7e915 Merge pull request #3432 from brynary/master 
Add Code Climate badge
 2012-07-03 11:09:17 -07:00
Maxwell Salzberg
c2bbe4e466 somehow some dirty state made it into my merge :( 2012-07-02 11:34:31 -07:00
Bryan Helmkamp
7ca9761353 Add Code Climate badge 2012-07-02 14:28:31 -03:00
Maxwell Salzberg
190fceaf5c [SECURITY FIX] please update your pod ASAP 
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
 2012-07-02 10:00:12 -07:00
Jonne Haß
827bb82e5b make serbian translation available 2012-07-02 16:44:46 +02:00
Jonne Haß
168c0ee228 updated 41 locale files [ci skip] 2012-07-02 16:40:22 +02:00
Maxwell Salzberg
28ad6accaa Merge pull request #3424 from justindthomas/update-fog 
update-gems [ci skip]
 2012-06-28 16:09:59 -07:00
Justin Thomas
21f5e3241d update-gems 2012-06-28 11:58:54 -07:00