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

12336 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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ß
8434b25e56 do not bypass pluralization in test 2012-06-24 13:03:22 +02:00
Jonne Haß
8c8ff1f8b8 there's no need anymore to specify all possible pluralization keys unless there are other keys alongside them 2012-06-24 12:43:15 +02:00
Jonne Haß
c9e54700ff string concatenation is still bad 2012-06-24 12:21:52 +02:00
Maxwell Salzberg
7298cf9212 Merge pull request #3414 from movilla/admin_week_user 
Last translation admin-panel (weekly user) [ci skip]
 2012-06-23 19:57:22 -07:00
movilla
1417cd5b0f Last translation admin-panel (weekly user) 2012-06-24 02:34:49 +02:00
Jonne Haß
7955600533 updated 13 locale files [ci skip] 2012-06-21 16:18:12 +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
Steven Hancock
b0e428b34e Merge pull request #3398 from zscott/3382_fix 
Fixed Issue #3382 - The comments under postings are missing when using t...
 2012-06-18 23:08:12 -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
Steven Hancock
05c856170e Merge pull request #3395 from stevenh512/update_cucumber 
Update Cucumber and Selenium [ci skip]
 2012-06-18 16:56:27 -07:00
Steven Hancock
6344d43432 Update Cucumber and Selenium 
Attempting to appease the Travis Bot
 2012-06-18 16:30:13 -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
6bd93a1164 Merge pull request #3404 from Raven24/fix-3320 
use default format in case a tablet device is detected
 2012-06-18 14:13:17 -07:00
Florian Staudacher
0596f5345d use default format in case a tablet device is detected 2012-06-18 22:50:15 +02:00
Florian Staudacher
bccee23854 Merge pull request #3399 from Raven24/fix-3327 
don't open comment pane on show page, if a modifier key is pressed
 2012-06-18 11:22:29 -07: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
b6bc2eacea Merge pull request #3401 from Raven24/fix-registration-form-validations 
fix client-side validations in registration form
 2012-06-18 10:59:31 -07:00