Commit graph

12678 commits

Author SHA1 Message Date
Régis Hanol
dec881ac9d Merge pull request #3024 from oblakeerickson/avatar_return_json
Have pick_avatar return json.
2014-12-06 18:20:42 +01:00
Blake Erickson
a61519eebf Have pick_avatar return json.
I'm working on writing a test in the discourse_api gem for uploading
avatars and the pick method needs to return a json response.

I also added a test to make sure json is returned.
2014-12-06 09:26:32 -07:00
Régis Hanol
bb85137069 Merge pull request #3022 from techAPJ/update-translations
Update Translations
2014-12-06 16:38:17 +01:00
Régis Hanol
86c4c947a3 FIX: drastically simplify auto-close topic logic
Get rid of this nonsensical maximum-flow algorithm :fired:
2014-12-06 16:29:54 +01:00
Robin Ward
da4e19af5b Deprecations for future ember, {{outlet}} names need strings 2014-12-05 17:06:20 -05:00
Robin Ward
72749a24e1 FIX: Broken HTML (thanks HTMLbars) 2014-12-05 17:03:08 -05:00
Neil Lalonde
0f37ce1083 FIX: share popup on mobile layout went outside of viewport, and z-index was behind user avatars. Use a real link on touch devices instead of a text input. 2014-12-05 16:21:07 -05:00
Régis Hanol
cd170ca548 FEATURE: auto-close topics based on community flags 2014-12-05 19:37:43 +01:00
Sam
968064c791 shift code into server safe section 2014-12-05 17:41:59 +11:00
Sam
10dec66c1f missing translation 2014-12-05 17:38:14 +11:00
Sam
609e7d7d69 Merge pull request #3023 from techAPJ/patch-4
FIX: auto response email replies should not be accepted
2014-12-05 17:21:01 +11:00
Sam
357a12f78e FEATURE: work-in-progress emoji selector toolbar item 2014-12-05 17:19:17 +11:00
Sam
b08f724e2b FEATURE: in:private keyword for searching private messages 2014-12-05 10:22:39 +11:00
Sam
bc772233a7 ramp it down to 1 second, already handled on server so it will hold you back 2014-12-05 09:58:50 +11:00
Sam
3faa220dbc ramp down "Forgot password" disable down to 5 seconds. 2014-12-05 09:56:46 +11:00
Robin Ward
50b75084bd Merge pull request #3025 from awesomerobot/master
fixing loading spinner alignment and striping
2014-12-04 17:13:22 -05:00
Robin Ward
5f6f85b182 FIX: Disable loading below HTML, we have our own spinner for that and it
broke scrolling on some custom CSS.
2014-12-04 17:12:47 -05:00
Kris Aubuchon
d8c8264b4e fixing loading spinner alignment and striping 2014-12-04 17:05:47 -05:00
Neil Lalonde
917a91eb40 FIX: permalink redirect support for url's with extensions in them, like .html and .php 2014-12-04 16:39:10 -05:00
Jeff Atwood
3aaa7d5b03 update search help with in:private 2014-12-04 13:37:47 -08:00
Robin Ward
e1f4d781d2 Remove unncessary null check now that the fix is done properly 2014-12-04 16:13:55 -05:00
Robin Ward
a1498925ef FIX: Errors due to _elementCreated called on null 2014-12-04 16:10:10 -05:00
Robin Ward
dd7b3d313e FIX: Selecting default option without changing HTML markup.
I also filed a bug on Ember.js with details on the error.
2014-12-04 15:21:47 -05:00
Robin Ward
5ec77d4be4 FIX: If a category can't be found, don't include it in the list 2014-12-04 13:04:58 -05:00
Arpit Jalan
d28515792a FIX: auto response email replies should not be accepted 2014-12-04 22:39:13 +05:30
Robin Ward
5492bbe11c FIX: Couldn't click delete topic button due to missing action 2014-12-04 11:49:53 -05:00
Arpit Jalan
44e694819d Update Translations 2014-12-04 19:48:21 +05:30
Robin Ward
e035b07e92 Put Ember 1.8.1 + fixes back. 2014-12-04 08:51:35 -05:00
Sam
b6bf6669c0 Merge pull request #3018 from gschlager/i18n_fix08
Add German translations for Emoji plugin
2014-12-04 14:24:24 +11:00
Sam
c46b4bd12c Merge pull request #3020 from bear-metal/master
Minor additions to script/bench.rb
2014-12-04 14:22:32 +11:00
Sam
8f4e8fe8f2 FIX: only show "new pm" in pm tab when looking at your own profile 2014-12-04 13:50:36 +11:00
Sam
4aa0d88c6c FEATURE: search private messages option 2014-12-04 13:50:36 +11:00
Jeff Atwood
174a00c985 Merge pull request #3019 from awesomerobot/master
making some adjustments to posts so they don't break at narrow widths
2014-12-03 18:18:45 -08:00
Lourens Naudé
096138d0f7 Ensure tmp/pids exist when using unicorn 2014-12-04 01:30:00 +00:00
Kris Aubuchon
96ae3eccb3 making some adjustments to how posts are laid out so they don't break at small widths 2014-12-03 20:20:19 -05:00
Jason W. May
efa872e426 optional custom value for category slug (create and update) 2014-12-03 16:23:59 -08:00
Sam
228f7542da FEATURE: Re-prioritize related so unread is always first 2014-12-04 10:04:23 +11:00
Gerhard Schlager
52f938ad53 Add German translations for Emoji plugin 2014-12-03 23:51:29 +01:00
Sam
8977d5917b revert 2014-12-04 09:35:11 +11:00
Sam
665ff94ff7 Revert "FIX: Don't show undefined in the footer text."
This reverts commit 7bf669ccf3.
2014-12-04 09:33:21 +11:00
Sam
a8d2f4b6d0 Revert "FIX: Word null appearing in user card"
This reverts commit 7f60276d66.
2014-12-04 09:32:49 +11:00
Sam
dbe6a70209 Revert "FIX: Check if the bio_cooked exists before outputting it."
This reverts commit 52f7f8e471.
2014-12-04 09:32:30 +11:00
Sam
6175973fda Revert "Patch Ember to fix https://github.com/emberjs/ember.js/issues/9805"
This reverts commit 393607d25c.
2014-12-04 09:32:02 +11:00
Sam
08501f53b4 Revert "FIX: Broken comboboxes. Workaround Ember bug that needs triaging"
This reverts commit d1cb946594.
2014-12-04 09:31:49 +11:00
Sam
6d1321192a micro bench template 2014-12-04 09:31:04 +11:00
Robin Ward
d1cb946594 FIX: Broken comboboxes. Workaround Ember bug that needs triaging 2014-12-03 17:17:45 -05:00
Robin Ward
393607d25c Patch Ember to fix https://github.com/emberjs/ember.js/issues/9805 2014-12-03 16:41:27 -05:00
Robin Ward
52f7f8e471 FIX: Check if the bio_cooked exists before outputting it. 2014-12-03 16:05:13 -05:00
Robin Ward
7f60276d66 FIX: Word null appearing in user card 2014-12-03 16:02:17 -05:00
Robin Ward
ead073bd87 FIX: If we are scheduled after being torn down don't do anything 2014-12-03 15:55:29 -05:00