Commit graph

7910 commits

Author SHA1 Message Date
Benjamin Kampmann
e6e03a1a96 move custom fields into its own concern 2014-04-29 19:26:42 +02:00
Régis Hanol
23ed5e0851 Merge pull request #2302 from awesomerobot/master
updating d-dropdown so long lists of categories can scroll
2014-04-29 15:57:00 +02:00
Kris Aubuchon
449de0368e updating d-dropdown so long lists of categories can scroll 2014-04-29 09:50:02 -04:00
Sam
c24d45cb2b Add missing dependency tracking 2014-04-29 13:32:09 +10:00
Sam
b93d47a267 BUGFIX: dependencies not tracked correctly 2014-04-29 13:27:24 +10:00
Sam
d18b136e54 Merge pull request #2299 from borhub/new_html_containers_to_help_custom_theming
User profile page and post page templates: add extra wrappers
2014-04-29 12:31:56 +10:00
Boris
88734957bf Topic page template: add extra wrapper around the username also for the deleted user case (missed in af69b78ecb ) 2014-04-29 11:55:16 +10:00
Sam
0fc4c47927 Merge pull request #2295 from vikhyat/badge-system
Titleable badges
2014-04-29 11:26:51 +10:00
Sam
ce3081ee72 Merge pull request #2300 from GitLaboratory/patch-1
Update INSTALL-ubuntu.md
2014-04-29 11:24:45 +10:00
Sam
35952055e2 BUGFIX: web crawlers messing with anon caching 2014-04-29 10:48:09 +10:00
Robin Ward
ba683bc611 FIX: XSS in markdown converter. 2014-04-28 14:44:15 -04:00
Neil Lalonde
495f78f574 oops, fix broken current_user_spec 2014-04-28 14:01:22 -04:00
Neil Lalonde
1da59e7e2e FIX: deactivated users shouldn't be able to log in 2014-04-28 13:46:28 -04:00
Neil Lalonde
9fba385172 FIX: don't onebox hidden posts 2014-04-28 11:03:19 -04:00
Il'ya A. Lykov
c6f7423289 Update INSTALL-ubuntu.md 2014-04-28 21:43:15 +07:00
Neil Lalonde
340fd303c8 FIX: in multisite setup, links to the current forum are whitelisted when looking for spam hosts 2014-04-28 10:37:28 -04:00
Boris
c934411228 User profile page template: add extra wrapper into primary details section to allow laying textual items out on the right of the avatar 2014-04-28 17:51:15 +10:00
Vikhyat Korrapati
a8e2c5e616 Use PreloadStore for the badge pages. 2014-04-28 10:30:50 +05:30
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Sam
e88e43bfb6 Merge pull request #2279 from fantasticfears/concern
move concerns to the model/concerns
2014-04-28 09:48:33 +10:00
Sam
4445b8c3c0 Factor out mocks 2014-04-28 00:34:55 +10:00
Jeff Atwood
c6d9829092 It's these COLONS! HE HATES THESE COLONS!
https://www.youtube.com/watch?v=Tcwz8-EfFYE
2014-04-27 01:35:39 -07:00
Jeff Atwood
ded1483f62 minor copyedit 2014-04-25 19:47:56 -07:00
Jeff Atwood
99ed0169f3 move security link here 2014-04-25 19:46:22 -07:00
Jeff Atwood
bba95cef8a Merge pull request #2296 from riking/reformat-ubuntu
Quote entire Ubuntu install guide
2014-04-25 19:43:59 -07:00
riking
0836d1a9ac Quote entire Ubuntu install guide 2014-04-25 19:05:35 -07:00
Robin Ward
89df580560 FIX: Reflected post links were being deleted when they shouldn't and
vice versa.
2014-04-25 16:49:48 -04:00
Robin Ward
b91c70cac3 FIX: Don't show quote controls when the post id is missing. 2014-04-25 15:41:24 -04:00
Neil Lalonde
47d000edcc Merge pull request #2292 from ligthyear/sass-variables
Improved Plugins SCSS management
2014-04-25 15:29:50 -04:00
Jeff Atwood
82adee2d61 Merge pull request #2294 from techAPJ/security-link-update
Update install guide link in SECURITY.md
2014-04-25 12:07:39 -07:00
Neil Lalonde
7993c27ce5 Also allow system_user to send pm's even if enable_private_messages is disabled 2014-04-25 14:52:57 -04:00
Régis Hanol
1a7ef2ae64 FEATURE: pre/code tags support in vanilla import 2014-04-25 20:07:21 +02:00
Benjamin Kampmann
64918c35f5 Improved Plugins SCSS management
- Moves the import of plugins for both mobile and desktop from common after discourse loading, allowing plugins to overwrite
 - Make desktop-option behave like the mobile-option: SCSS/CSS marked with that option will only be loaded for desktop from now on and ignored in mobile
 - Add variables-keyword, allowing plugins to ship and overwrite variables before they get imported by discourse (great for theming)
2014-04-25 18:25:45 +02:00
Robin Ward
535965263a Update onebox gem - don't show github.com twice in succession 2014-04-25 11:08:01 -04:00
Arpit Jalan
03e51b1a3a Update install guide link 2014-04-25 20:22:36 +05:30
Neil Lalonde
e05779b842 Version bump to v0.9.9.3 2014-04-25 10:42:09 -04:00
Neil Lalonde
1156c57cf6 Update translations 2014-04-25 10:17:20 -04:00
Neil Lalonde
20df262814 Add filters to colors ui 2014-04-25 10:10:17 -04:00
Régis Hanol
f8d9fb7bdc Revert "Merge pull request #2284 from jaimeiniesta/patch-1"
This reverts commit a6b88d1e7e, reversing
changes made to 9bee0b6e2d.
2014-04-25 11:40:38 +02:00
Jeff Atwood
d523a7b905 Merge pull request #2291 from riking/patch-2
Change MIGRATION.md to Docker instructions
2014-04-24 19:20:17 -07:00
Kane York
eb00458dcc Change MIGRATION.md to Docker instructions 2014-04-24 19:12:08 -07:00
Robin Ward
cf6cbb955b REFACTOR: Introduce Discourse.computed.setting to create a computed
property that links to a `Discourse.SiteSetting`
2014-04-24 18:36:02 -04:00
Robin Ward
cdd2101e4f FIX: Don't hotlink links for new users 2014-04-24 18:36:02 -04:00
Robin Ward
f527ac33b0 FIX: Make sure the unread counter is updated following a "Dismiss New" 2014-04-24 18:36:02 -04:00
Neil Lalonde
feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Neil Lalonde
0f4014eef1 Update translations 2014-04-24 10:53:04 -04:00
Neil Lalonde
69dee799e9 Add plugins/poll and discourse_imgur translation files to transifex 2014-04-24 10:53:03 -04:00
Régis Hanol
c52ee665b4 FEATURE: do not bump topic when pulling hotlinked images 2014-04-24 16:07:47 +02:00
Régis Hanol
d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system
Incrementally load users in the badge page
2014-04-24 12:14:41 +02:00
Vikhyat Korrapati
0357370b0d Use the user-badge component in the admin user badges page. 2014-04-24 14:48:30 +05:30