Commit graph

5312 commits

Author SHA1 Message Date
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
Régis Hanol
b063c4326f Merge pull request #1609 from awesomerobot/master
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
Kris Aubuchon
70fd4f7f6b merging local with master
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
Kris Aubuchon
4ce711a3b7 some general simplification to modal, menus, etc 2013-11-04 09:16:47 -05:00
Régis Hanol
4f8d0a1a96 revert changes to magnific-popup.scss 2013-11-04 14:44:52 +01:00
Régis Hanol
12ac2f2e99 FIX issues with quote button
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
2013-11-04 12:51:39 +01:00
Régis Hanol
934ede7d91 shorter message for untranslated strings 2013-11-04 11:52:12 +01:00
Sam
cc27c5f363 Rails 4 changes behavior of precompile not to include originals
This patch will restore rails 3 beavior and fix emoji etc under rails 4
2013-11-04 09:58:34 +11:00
Sander Datema
57c0f5ee4c Update client.nl.yml 2013-11-03 22:24:26 +01:00
Sander Datema
866a7057ad Update server.nl.yml 2013-11-03 22:22:40 +01:00
Vipul A M
895d801669 Dont call SiteSetting.uncategorized_category_id twice 2013-11-03 15:36:59 +05:30
Vikhyat Korrapati
855ee3b43d Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4. 2013-11-03 10:41:38 +05:30
Régis Hanol
5876b6c71b Merge pull request #1604 from ofgeek/patch-1
Update client.zh_CN.yml
2013-11-02 10:41:23 -07:00
ofGEEK
a7f53847c1 Update client.zh_CN.yml 2013-11-02 22:53:46 +08:00
Sam
8ff35d4b10 automatically make developers admins on account creation, this solves the user #1 problem
you can simply set the DEVELOPER_EMAILS to a comma delimited list and the users will be auto admined
2013-11-02 10:26:02 +11:00
Régis Hanol
a65a063a96 fix run-qunit 2013-11-02 00:22:25 +01:00
Régis Hanol
b56b11d96a add qunit to autospec 2013-11-01 23:57:50 +01:00
Neil Lalonde
e679ba97a3 FIX: categories created by users who are deleted cannot be deleted 2013-11-01 16:56:15 -04:00
Scott Albertson
c0cffca1e6 Test title updating 2013-11-01 13:43:31 -07:00
Scott Albertson
3cc17ad4cd Add test coverage for #update 2013-11-01 13:43:31 -07:00
Scott Albertson
58f96bdfb5 Remove duplication in test setup 2013-11-01 13:43:31 -07:00
Scott Albertson
2e7696630b Make #update specs consistent
* Use expect syntax
* Avoid lets
* Stub Guardian method used in the controller
2013-11-01 13:43:31 -07:00
Robin Ward
7a567d730d Merge pull request #1601 from awesomerobot/master
main logo size consistency fix
2013-11-01 13:32:37 -07:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward
04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00