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

6143 commits

Author SHA1 Message Date
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
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
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
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
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
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
movilla
5eab1226f6 Fix error admins/weekly_user_stats 2012-07-07 22:33:56 +03:00
movilla
2ff89ed33d Change root_url to root_path 2012-07-06 20:08:41 +03: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
Maxwell Salzberg
c2bbe4e466 somehow some dirty state made it into my merge :( 2012-07-02 11:34:31 -07: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
Florian Staudacher
20948d5e93 Merge pull request #3418 from Raven24/nicer-oembed 
oembed video info box
 2012-06-26 11:16:40 -07:00
Maxwell Salzberg
718f7e1dbb Merge pull request #3260 from panckreous/twitter-conf 
check for existence of key instead of checking secret twice
 2012-06-26 10:34:08 -07:00
Florian Staudacher
e19d73792d oembed video info 2012-06-25 15:25:09 +02:00
Florian Staudacher
9588169019 fix oembed iframe/thumb width for reshares [ci skip] 2012-06-25 13:09:56 +02:00
Jonne Haß
c9e54700ff string concatenation is still bad 2012-06-24 12:21:52 +02:00
movilla
1417cd5b0f Last translation admin-panel (weekly user) 2012-06-24 02:34:49 +02:00
Steven Hancock
d36209ae4b Merge pull request #3390 from stevenh512/fix_user_attributes 
User model -  mass-assignable attributes fix
 2012-06-20 11:41:28 -07:00
Zach Scott
82a47d0ba3 Fixed Issue #3382 - The comments under postings are missing when using the #tags -view 2012-06-18 22:46:01 -06:00
Maxwell Salzberg
fd748b8afb Merge pull request #3396 from fermionic/auto-rotate-images 
#2322 -- rotate uploaded images based on the meta-data
 2012-06-18 18:20:05 -07:00
Steven Hancock
a2f208b013 User model - mass-assignable attributes fix 
`:username`, `:email` and `:remember_me` should be mass-assignable.

fixes #3377
 2012-06-18 16:58:36 -07:00
Florian Staudacher
1fb016597d remove leftover edges from spinner, remove red bg color (fixes #3338) [ci skip] 2012-06-18 23:40:55 +02:00
Florian Staudacher
d3b70a7f3a small typo [ci skip] 2012-06-18 23:40:18 +02:00
Florian Staudacher
0596f5345d use default format in case a tablet device is detected 2012-06-18 22:50:15 +02:00
Florian Staudacher
64a20793ec don't open comment pane on show page, if a modifier key is pressed 2012-06-18 20:04:20 +02:00
Florian Staudacher
994bfd4a24 fix client-side validations in registration form + test 2012-06-18 18:57:44 +02:00
Florian Staudacher
f4d7196fb5 tell jQuery not to expect html when deleting photos in the publisher 2012-06-18 15:25:50 +02:00
Zach Prezkuta
ab9bd2f9e3 #2322 -- rotate uploaded images based on the meta-data 2012-06-17 19:47:34 -06:00
Maxwell Salzberg
d331a14dd2 limit the amount of people in a converasation to prevent hella spam 2012-06-17 15:51:18 -07:00
Maxwell Salzberg
d3487c8b7d fix sa mall possible xss in personImage handlebar helpers if the attacker had access to your root domain. fixes #3392 2012-06-16 14:59:51 -07:00
movilla
d5aefaa64c Login with pod_name 2012-06-16 22:51:38 +02:00
Steven Hancock
9280753950 Fix deprecation warning, :confirm option on links is deprecated 
Use `:data => { :confirm => 'text' }` instead.
 2012-06-14 01:56:51 -07:00
Steven Hancock
033e8e5cb6 Fix ActiveRecord queries - take two 2012-06-13 14:52:25 -07:00
Steven Hancock
79b7d38158 Fix ActiveRecord queries with nested hashes 
Rails 3.2.6 doesn't like them
 2012-06-13 14:18:09 -07:00
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
Zach Prezkuta
44e43158cc add rspec test and make fix more rails-y 2012-06-08 22:51:16 -06:00
Zach Prezkuta
ed51f34ebb strip comment text upon comment creation 2012-06-08 22:51:16 -06: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
Daniel Grippi
5b424e7d94 don't use quotes for chartbeat (it's picky) [ci skip] 2012-06-05 00:14:00 -07:00
Daniel Grippi
44f2b7ae44 Update master 2012-06-04 23:47:20 -07:00