a13d05660f
FIX: Show status icons on user topic pages
2013-11-04 13:13:22 -05:00
5c3f12f369
merging
...
Merge remote-tracking branch 'upstream/master'
2013-11-04 12:59:17 -05:00
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
1c2b5015a3
fixing user title line-height, adding @mention style back in, consistent category width/alignment
2013-11-04 12:45:18 -05:00
5e69b277ea
FIX: emoticon 💩 wasn't working :)
2013-11-04 11:47:23 -05:00
7360112759
Merge pull request #1600 from GManzato/user_page_flat
...
Flatter design on User Page
2013-11-04 07:25:57 -08:00
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
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
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
e17a5092fe
Merge pull request #1607 from sanderdatema/patch-1
...
Update server.nl.yml
2013-11-04 07:14:10 -08:00
4b223165ab
Merge pull request #1608 from sanderdatema/patch-2
...
Update client.nl.yml
2013-11-04 07:13:37 -08:00
b063c4326f
Merge pull request #1609 from awesomerobot/master
...
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
70fd4f7f6b
merging local with master
...
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
4ce711a3b7
some general simplification to modal, menus, etc
2013-11-04 09:16:47 -05:00
4f8d0a1a96
revert changes to magnific-popup.scss
2013-11-04 14:44:52 +01:00
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
934ede7d91
shorter message for untranslated strings
2013-11-04 11:52:12 +01:00
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
57c0f5ee4c
Update client.nl.yml
2013-11-03 22:24:26 +01:00
866a7057ad
Update server.nl.yml
2013-11-03 22:22:40 +01:00
895d801669
Dont call `SiteSetting.uncategorized_category_id` twice
2013-11-03 15:36:59 +05:30
855ee3b43d
Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4.
2013-11-03 10:41:38 +05:30
5876b6c71b
Merge pull request #1604 from ofgeek/patch-1
...
Update client.zh_CN.yml
2013-11-02 10:41:23 -07:00
a7f53847c1
Update client.zh_CN.yml
2013-11-02 22:53:46 +08:00
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
a65a063a96
fix run-qunit
2013-11-02 00:22:25 +01:00
b56b11d96a
add qunit to autospec
2013-11-01 23:57:50 +01:00
e679ba97a3
FIX: categories created by users who are deleted cannot be deleted
2013-11-01 16:56:15 -04:00
c0cffca1e6
Test title updating
2013-11-01 13:43:31 -07:00
3cc17ad4cd
Add test coverage for #update
2013-11-01 13:43:31 -07:00
58f96bdfb5
Remove duplication in test setup
2013-11-01 13:43:31 -07:00
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
7a567d730d
Merge pull request #1601 from awesomerobot/master
...
main logo size consistency fix
2013-11-01 13:32:37 -07:00
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
04aa1690e2
Adjust ul,ol margins
2013-11-01 15:48:28 -04:00
1f283b5ca9
main logo size consistency fix
2013-11-01 15:45:56 -04:00
bbf0312e72
FIX: Non-Admins couldn't send private messages through the new user expansion
2013-11-01 15:18:26 -04:00
0060050c08
Replace data-dismiss=modal with action close. It's better to use our own ember code instead of relying on bootbox magic.
2013-11-01 12:14:08 -04:00
6b31e4fda5
Merge pull request #1598 from velesin/logo_component_cleanup
...
cleans up logo integration tests
2013-11-01 08:45:45 -07:00
92a0729937
When banning a user, a reason can be provided. The user will see this reason when trying to log in. Also log bans and unbans in the staff action logs.
2013-11-01 10:47:26 -04:00
52b0c1c45f
When logging the deletion of a user, don't store its id in the target_user_id column. It will never match a user record.
2013-11-01 10:47:26 -04:00
3826e67007
Flatter design on User Page
...
- Cleanup of the design ( remove border-radius ... )
- Fixed some alignment and width in mobile and lower screen size
2013-11-01 15:38:07 +01:00
57d78aaba6
Merge pull request #1599 from ofgeek/patch-1
...
Update client.zh_CN.yml
2013-11-01 02:14:04 -07:00
ddf47e54af
Update client.zh_CN.yml
2013-11-01 14:48:34 +08:00
233cca79b5
dead git repo broke discourse
2013-11-01 15:21:40 +11:00
b93ca1089e
List subcategories on categories page
2013-10-31 18:02:24 -04:00
5a78c1cb34
Changed confusing 'all categories' text
2013-10-31 16:41:13 -04:00
6ff2abd6aa
Move category badge to left of topic name in non-fixed header
2013-10-31 16:31:01 -04:00
7ef76fd4c3
Change "Create XXX Topic" to "Create Topic"
2013-10-31 16:29:41 -04:00
744cd93f28
FIX: Non-English category name regression
2013-10-31 16:25:26 -04:00
Robin Ward
Kris Aubuchon
Neil Lalonde
Régis Hanol
Sam
Sander Datema
Vipul A M
Vikhyat Korrapati
ofGEEK
Scott Albertson
Gilles Manzato