Commit Graph

13046 Commits

Author SHA1 Message Date
Jeff Atwood
dc96d6bafe move admin topic wrench down a bit 2015-02-03 15:01:23 -08:00
Neil Lalonde
8689c85b54 add error handling when granting admin and moderator privileges 2015-02-03 17:42:08 -05:00
Robin Ward
aacf2e6f20 Can add shadowed_by_global to a site setting to override
If a site setting has `shadowed_by_global: true` then, if
a `GlobalSetting` exists with the same name then that value
will be used instead.  Additionally, the setting will be hidden.

This is useful in a multisite environment for private settings
such as API keys. You want to set it globally, yet not display
the key to customers.
2015-02-03 16:49:22 -05:00
Robin Ward
4c6c021b5c Merge pull request #3168 from techAPJ/patch-2
add class for container div on 404 page
2015-02-03 15:12:58 -05:00
Robin Ward
14a8b3e29c FIX: In case a topic is deleted, allow us to serialize their posts 2015-02-03 14:51:50 -05:00
Neil Lalonde
8a1197626d Version bump to v1.2.0.beta6 2015-02-03 14:18:10 -05:00
Arpit Jalan
68377ba4ab add class for container div on 404 page 2015-02-04 00:40:21 +05:30
Neil Lalonde
b64deaae67 Merge pull request #3167 from techAPJ/update-translations
Update Translations
2015-02-03 14:03:40 -05:00
Arpit Jalan
ba0cb45f4b Update Translations 2015-02-04 00:20:05 +05:30
Robin Ward
9a07945a16 FIX: Don't add constants for ES6 modules in plugins
If you're using ES6 in a plugin, you shouldn't be depending on the
backwards compatibility layer. That's for proper Discourse only.
2015-02-03 13:14:05 -05:00
Robin Ward
d0630b7f26 Update to latest onebox gem 2015-02-03 12:55:41 -05:00
Régis Hanol
0e5c9b2590 small upload code refactor 2015-02-03 18:44:18 +01:00
Régis Hanol
91b3123e14 Merge pull request #3165 from techAPJ/patch-2
FIX: allow TL4 user to rebake post
2015-02-03 18:32:43 +01:00
Arpit Jalan
b413c6249d FIX: allow TL4 user to rebake post 2015-02-03 22:49:01 +05:30
Robin Ward
d9c6acafc0 Merge pull request #3164 from techAPJ/patch-2
FIX: URL encoding was not working for %23 in links
2015-02-03 11:39:40 -05:00
Arpit Jalan
a092944582 FIX: URL encoding was not working for %23 in links 2015-02-03 22:06:49 +05:30
Jeff Atwood
c1ddda3e8f try removing "loading topic..." vs spinner 2015-02-02 23:10:07 -08:00
Sam
7e259375e9 PERF: properly pass topic_id to post action cache to avoid excessive query
in the past auto closing was forcing a consistency check on topic, which in
turn was triggering a full post action cache rebuild
2015-02-03 15:59:26 +11:00
Sam
85d9b2d227 regression, missing local storage would cause script to break 2015-02-03 13:17:03 +11:00
Sam
78b879d666 remove superflous rules break firefox 2015-02-03 11:56:57 +11:00
Sam
5ddec2e76d revert lodash upgrade, it is causing severe breakages elsewhere 2015-02-03 11:51:34 +11:00
Jeff Atwood
80d8b133d9 slight emoji dialog tweak 2015-02-02 15:41:53 -08:00
Sam
5eea774f54 update gems 2015-02-03 10:31:37 +11:00
Sam
0f1bd60ab2 update gems 2015-02-03 10:24:24 +11:00
Sam
d1dd0d888a FIX: message bus was causing constant redis growth
(minor amount of space but it adds up)
2015-02-03 10:22:40 +11:00
Jeff Atwood
2dbe747918 emoji dialog UX tweaks
https://meta.discourse.org/t/idea-design-window-emoticons/24654
2015-02-02 14:43:10 -08:00
Régis Hanol
03f7a12b52 UX: use 🌟 icon for recently used emoji tab 2015-02-02 22:28:58 +01:00
Neil Lalonde
a064bad9a3 fix Ning import script when resuming an import 2015-02-02 16:01:48 -05:00
Régis Hanol
20308ecfd9 fix typo (stupid 🇫🇷) 2015-02-02 21:55:44 +01:00
Régis Hanol
69f95df297 FEATURE: recently used emoji tab
⬆️ update lodash to V.3.0.1
2015-02-02 21:54:15 +01:00
Robin Ward
06279b5c6a Add a new event for when a post is confirmed as spam 2015-02-02 15:52:21 -05:00
Régis Hanol
0a252d7785 FIX: quote whote post should insert at cursor position 2015-02-02 19:08:28 +01:00
Robin Ward
f15b0d205f FIX: The "too similar" check happened when trying to make a post a wiki 2015-02-02 12:44:56 -05:00
Neil Lalonde
b56999e984 show last 30 days on about page 2015-02-02 12:27:49 -05:00
Robin Ward
8ba72b3a84 Merge pull request #3161 from techAPJ/patch-2
FIX: uncategorized category was not loading updates in edit mode
2015-02-02 11:29:28 -05:00
Arpit Jalan
88306cc112 FIX: uncategorized category was not loading updates in edit mode 2015-02-02 21:50:29 +05:30
Régis Hanol
b9ff4a5e81 UX: fix 'revision details' styling in revision history window 2015-02-02 12:13:37 +01:00
Jeff Atwood
5605238fb7 Merge pull request #3160 from techAPJ/update-docs
update meta url
2015-02-02 02:21:20 -08:00
Arpit Jalan
5bfa6e5ab9 update meta url 2015-02-02 15:44:38 +05:30
Jeff Atwood
9d4ee9553d add some breathing room to quoted categories 2015-02-02 02:08:06 -08:00
Régis Hanol
e2a65a6605 Merge pull request #3159 from riking/patch-6
FIX: Add Google Analytics code to crawler view
2015-02-02 11:07:47 +01:00
Jeff Atwood
737f81b3a9 remove default bgcolor from code highlight 2015-02-02 01:53:24 -08:00
Jeff Atwood
e45b3c15c3 Revert "FIX: auto orientation code causing grey images to appear blackish"
This reverts commit f680374820.
2015-02-02 01:27:52 -08:00
riking
c6e27399b3 FIX: Add Google Analytics code to crawler view 2015-02-02 00:49:58 -08:00
Sam
8304c306a4 Merge pull request #3158 from techAPJ/patch-2
FIX: Not allow TL4 user to set staff color
2015-02-02 16:27:39 +11:00
Arpit Jalan
a29970275a FIX: Not allow TL4 user to set staff color 2015-02-02 10:38:42 +05:30
Jeff Atwood
be16bbdd89 Merge pull request #3157 from mcwumbly/install-docs
Update install docs:
2015-02-01 17:14:37 -08:00
David McClure
e6d9f02f0a Update install docs:
1. add deprecation warning for Heroku install guide
2. remove incomplete and outdated cloud66 guide
3. remove unused links to unofficial guides from main install doc
2015-02-01 15:28:40 -08:00
Sam
05a56b25a9 FIX: setting custom avatar would not work a lot of the time
Due to internal structure we were often caching "redirect" images.
2015-01-31 23:42:50 +11:00
Sam
f680374820 FIX: auto orientation code causing grey images to appear blackish 2015-01-31 18:05:50 +11:00