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 |
|
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 |
|
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 |
|
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 |
|