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

12238 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Florian Staudacher
994bfd4a24 fix client-side validations in registration form + test 2012-06-18 18:57:44 +02:00
Florian Staudacher
f3d983151b Merge pull request #3402 from Raven24/fix-photo-delete 
tell jQuery not to expect html when deleting photos in the publisher
 2012-06-18 06:52:04 -07:00
Florian Staudacher
f4d7196fb5 tell jQuery not to expect html when deleting photos in the publisher 2012-06-18 15:25:50 +02: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
Maxwell Salzberg
ab28c53626 Merge pull request #3391 from movilla/login_pod 
Login with pod_name [ci skip]
 2012-06-16 14:46:23 -07:00
movilla
d5aefaa64c Login with pod_name 2012-06-16 22:51:38 +02:00
Maxwell Salzberg
51661091d5 Merge pull request #3385 from Raven24/federation-colors 
Federation logger stuff[ci skip]
 2012-06-15 11:55:25 -07:00
Florian Staudacher
0c8621fa9e Merge pull request #3386 from diaspora/nicer-cukes 
cleanup session cukes
 2012-06-15 11:19:32 -07:00
Florian Staudacher
0fb0bf00af be more specific in config, point to more info [ci skip] 2012-06-15 20:14:51 +02:00
Florian Staudacher
b184415c19 cleanup session cukes 2012-06-15 19:30:08 +02:00
Florian Staudacher
bff069ab19 tinker with log messages for readability 2012-06-15 17:43:14 +02:00
Florian Staudacher
8f21657179 add all the colors of the rainbow, log into the same file 
and throw in some formatting
 2012-06-15 15:30:49 +02:00
Florian Staudacher
0ce411c11c fix startup error for integration envs 2012-06-15 15:30:49 +02:00
Florian Staudacher
6546f63208 Merge pull request #3383 from ChaosCoder/patch-1 
Removed double "the" in section "Quick Start - Step 2"
 2012-06-14 16:49:16 -07:00
Andreas Ganske
87a8bf3520 Removed double "the" in section "Quick Start - Step 2" 2012-06-15 02:19:19 +03:00
Jonne Haß
aa3a6f9439 updated 37 locale files [ci skip] 2012-06-14 15:53:18 +02:00
Steven Hancock
7e41974666 Merge pull request #3380 from stevenh512/fix_confirm_deprecation 
Fix deprecation warning, :confirm option on links is deprecated
 2012-06-14 02:18:38 -07: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
ee6941fa18 Get Spork running again 
Use Rails.root.join in `spec/spec_helper.rb` to help Spork find
`helper_methods.rb` and `spec_doc.rb`.
 2012-06-14 00:53:10 -07:00
Steven Hancock
01449f765e Merge pull request #3376 from stevenh512/rails-3-2-6 
Update Rails to 3.2.6
 2012-06-13 15:10:42 -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
a2ccf685ca Update Rails to 3.2.6 2012-06-13 06:19:32 -07:00
Florian Staudacher
acc62e7380 forgot to put new css file in precompile list [ci skip] 2012-06-12 13:19:05 +02:00
Steven Hancock
3547654e6a Merge pull request #3372 from stevenh512/use_https 
Use https for git dependencies in the Gemfile

Followup to #3358
 2012-06-11 20:29:12 -07:00
Steven Hancock
dc2184724b Use https for git dependencies in the Gemfile 
This is useful if your development and/or production setup is behind
a firewall and you can't use `git://`. Followup to #3358
 2012-06-11 20:24:54 -07:00
Steven Hancock
cac744c0b0 Update Gemfile.lock 
Somehow heroku_san was still locked at 3.0.1 :)
 2012-06-11 20:23:21 -07:00
Steven Hancock
2b47848da9 Autoload needs a string, not a Pathname 
fixes #3373
 2012-06-11 15:11:05 -07:00
Maxwell Salzberg
c764bae345 Merge pull request #3371 from stevenh512/rails_root 
Rails.root and File.join cleanup [ci skip]
 2012-06-11 11:01:47 -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
Adrián Chaves Fernández (Gallaecio)
994ece57f5 Updated Galician (gl) translation. 2012-06-10 12:57:09 +02:00
Maxwell Salzberg
6e39ffa3da Merge pull request #3363 from fermionic/parent-signature-fails-with-leading-whitespace 
strip comment text upon comment creation
 2012-06-09 13:08:26 -07:00
Zach Prezkuta
9f6d84141c fix incorrect comment on RSpec text 2012-06-09 09:34:06 -06: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
Florian Staudacher
09cf60f794 use File.join when it's already there 2012-06-07 21:19:41 +02:00
Maxwell Salzberg
260a116e87 Merge pull request #3358 from nsdevaraj/patch-1 
Edited git to https for access behind firewalls [ci skip]
 2012-06-07 10:53:12 -07:00
Maxwell Salzberg
a15b239c51 Merge pull request #3359 from wubwubwubcr3w/update_heroku_san 
update heroku_san gem [ci skip]
 2012-06-05 11:13:41 -07:00
Jonne Haß
46a01664bb fix minor typo: eliminate double spaces [ci skip] 2012-06-05 19:07:44 +02:00
wubwubwubcr3w
8e4e5545eb update heroku_san gem 2012-06-05 16:07:27 +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
N.S.Devaraj
94e5b4dc7b Update master 2012-06-05 11:17:26 +05:30