Sam
|
dee38dad9d
|
we don't need this backport
|
2013-11-06 11:44:29 +11:00 |
Robin Ward
|
4a7ef8b460
|
Adjust margins of ul, ol: they were slightly to the left
|
2013-11-05 17:57:05 -05:00 |
|
Robin Ward
|
25ef66c60b
|
User invites page now has search, displays first `invites_shown` records
|
2013-11-05 17:53:26 -05:00 |
|
Sam
|
11260b4af4
|
Merge pull request #1618 from railsaholic/rails4_spec_deprecation_warning_fix
Relation#all deprecation warning fix for Rails 4
|
2013-11-05 14:40:10 -08:00 |
Neil Lalonde
|
8838b555cd
|
The entire notification when there are new topics is clickable
|
2013-11-05 16:56:32 -05:00 |
|
Neil Lalonde
|
adba0c2996
|
Avoid deprecation warning about whitelist_attributes in rails 4
|
2013-11-05 15:47:43 -05:00 |
|
Neil Lalonde
|
18bc6ecd08
|
Sidetiq::Clock#start is deprecated. Remove it.
|
2013-11-05 15:43:48 -05:00 |
|
Neil Lalonde
|
2342da893d
|
Fix [object object] being rendered where it should be an ip address
|
2013-11-05 15:00:54 -05:00 |
|
Neil Lalonde
|
6597738322
|
Improve how banned fields are rendered on admin user page
|
2013-11-05 15:00:54 -05:00 |
Manoj
|
a1e2706c2f
|
Relation#all deprecation warning fix for Rails 4
|
2013-11-06 01:05:28 +05:30 |
|
Robin Ward
|
bba5631923
|
Merge pull request #1614 from velesin/integration_test_helper_improvement
enables passing additional setup / teardown code to integration test helper
|
2013-11-05 10:39:39 -08:00 |
|
Robin Ward
|
84b0792db8
|
Merge pull request #1616 from velesin/remove_notifications_view
removes unused view
|
2013-11-05 10:38:51 -08:00 |
Régis Hanol
|
37fd7ab574
|
pull hotlinked images
|
2013-11-05 19:07:29 +01:00 |
Wojciech Zawistowski
|
2f2b99f766
|
removes unused view
|
2013-11-05 18:10:04 +01:00 |
|
Wojciech Zawistowski
|
52208b4eb7
|
adds integration tests for notifications dropdown in header
|
2013-11-05 17:56:13 +01:00 |
|
Wojciech Zawistowski
|
1dcd2d903b
|
enhances integration test helper with the ability to invoke additional setup / teardown code
|
2013-11-05 17:42:37 +01:00 |
|
Neil Lalonde
|
8724b2e2b6
|
Add comments about the IPAddr hack
|
2013-11-05 11:24:13 -05:00 |
|
Régis Hanol
|
e45ab7d4a8
|
fix rspec reloaders
|
2013-11-05 14:53:35 +01:00 |
|
Régis Hanol
|
7923d4d170
|
Merge pull request #1613 from vipulnsward/locale_typos
Fix some locale typos
|
2013-11-05 03:02:19 -08:00 |
Vipul A M
|
44bea4de38
|
Fix some locale typos
|
2013-11-05 16:13:49 +05:30 |
|
Régis Hanol
|
9f1b7f799f
|
Merge pull request #1612 from jjangg96/Korean
Edited Korean Client yml
|
2013-11-05 02:27:01 -08:00 |
|
Régis Hanol
|
eb9c1f28ed
|
add debug mode to autospec
|
2013-11-05 11:01:17 +01:00 |
jjangg96
|
cc99fe22e6
|
Edited Korean Client yml
|
2013-11-05 18:50:48 +09:00 |
|
Sam
|
a2efe27a58
|
allow compile in profile.
|
2013-11-05 14:12:26 +11:00 |
|
Sam
|
15996bc52f
|
even on mobile it can be important
|
2013-11-05 13:44:18 +11:00 |
|
Sam
|
2c1b58c8cc
|
mini profiler is there for a reason :)
|
2013-11-05 13:43:50 +11:00 |
|
Sam
|
415d4df648
|
work around bust encodings passed in to method
|
2013-11-05 13:40:39 +11:00 |
|
Sam
|
3bdd2eeeba
|
fix multisite to work with rails 4
|
2013-11-05 11:11:34 +11:00 |
|
Sam
|
1e21fc8c9a
|
fix regression in Rails 4
|
2013-11-05 10:32:35 +11:00 |
|
Sam
|
b11e665ecc
|
Rails 4 is now the out-of-the-box default
|
2013-11-05 09:36:52 +11:00 |
|
Neil Lalonde
|
9c91ddd854
|
Should have put order on the screened urls results
|
2013-11-04 16:31:31 -05:00 |
|
Neil Lalonde
|
bd9b85f076
|
Screened Urls page shows results for each domain instead of each url
|
2013-11-04 16:24:48 -05:00 |
|
Robin Ward
|
0b79636b99
|
Typo!
|
2013-11-04 15:56:03 -05:00 |
|
Robin Ward
|
ec7298d548
|
FIX: Regression on topic list for best of links.
|
2013-11-04 15:48:51 -05:00 |
|
Robin Ward
|
c86b06e3fa
|
Fix for non-english email polling.
|
2013-11-04 15:30:24 -05:00 |
|
Robin Ward
|
b8e63719f8
|
FIX: Don't autolink within a markdown link.
|
2013-11-04 14:24:40 -05:00 |
|
Robin Ward
|
cc47ade2ed
|
missing semi colon
|
2013-11-04 13:59:31 -05:00 |
|
Robin Ward
|
69503345c4
|
FIX: Some more non-english category errors
|
2013-11-04 13:43:33 -05:00 |
|
Robin Ward
|
ee6b97754a
|
Merge pull request #1611 from awesomerobot/master
Category-dropdown items have consistent widths... other fixes
|
2013-11-04 10:17:21 -08:00 |
|
Robin Ward
|
a13d05660f
|
FIX: Show status icons on user topic pages
|
2013-11-04 13:13:22 -05:00 |
Kris Aubuchon
|
5c3f12f369
|
merging
Merge remote-tracking branch 'upstream/master'
|
2013-11-04 12:59:17 -05:00 |
|
Neil Lalonde
|
ede59a4386
|
FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available.
|
2013-11-04 12:51:09 -05:00 |
|
Kris Aubuchon
|
1c2b5015a3
|
fixing user title line-height, adding @mention style back in, consistent category width/alignment
|
2013-11-04 12:45:18 -05:00 |
|
Robin Ward
|
5e69b277ea
|
FIX: emoticon 💩 wasn't working :)
|
2013-11-04 11:47:23 -05:00 |
|
Robin Ward
|
7360112759
|
Merge pull request #1600 from GManzato/user_page_flat
Flatter design on User Page
|
2013-11-04 07:25:57 -08:00 |
|
Robin Ward
|
ae81d78ab9
|
Merge pull request #1605 from vikhyat/fix-activerecord-associations-collectionproxy-serialization
Fix serialization of ActiveRecord::Associations::CollectionProxy in Rails 4
|
2013-11-04 07:16:52 -08:00 |
|
Robin Ward
|
b474babe26
|
Merge pull request #1602 from salbertson/sa-refactor-users-update-specs
Refactor specs for UsersController#update
|
2013-11-04 07:16:18 -08:00 |
|
Robin Ward
|
a2794912a3
|
Merge pull request #1606 from vipulnsward/remove_double_calls
Dont call `SiteSetting.uncategorized_category_id` twice
|
2013-11-04 07:14:39 -08:00 |
|
Robin Ward
|
e17a5092fe
|
Merge pull request #1607 from sanderdatema/patch-1
Update server.nl.yml
|
2013-11-04 07:14:10 -08:00 |
|
Robin Ward
|
4b223165ab
|
Merge pull request #1608 from sanderdatema/patch-2
Update client.nl.yml
|
2013-11-04 07:13:37 -08:00 |