Sam
3b033d2899
allow users to override groups if needed
2014-12-09 12:09:46 +11:00
Sam
4f4c49f702
Merge pull request #3031 from oblakeerickson/activate_return_json
...
Have activate user return json
2014-12-09 10:12:42 +11:00
Robin Ward
4de412365e
The {{i18n}} helper should use quotes when looking up keys, always.
2014-12-08 16:36:18 -05:00
Régis Hanol
63d4932549
Merge pull request #3032 from awesomerobot/master
...
adding max-height for embedded video
2014-12-08 21:48:19 +01:00
Kris Aubuchon
448acc627b
adding max-height for embedded video
2014-12-08 15:39:36 -05:00
Robin Ward
5fd3f2547c
FIX: Fix rerendering issues on some components.
2014-12-08 14:47:49 -05:00
Blake Erickson
1d0eccf710
Have activate user return json
...
- Change activate user from admin controller to return json
- Test that it returns json
- Remove unnessary test from log_out spec
This commit was created so that when you activate a user through the api
it returns a json response.
2014-12-08 11:16:57 -07:00
Robin Ward
7069ee16e2
FIX: Javascript error when uploading backup
2014-12-08 12:38:36 -05:00
Sam
f0dda91364
Merge pull request #3030 from longhotsummer/fix-facebook-no-email
...
Facebook auth without an email should allow user to enter email
2014-12-08 21:49:16 +11:00
Greg Kempe
e979382ab4
Facebook auth without an email should allow user to enter email
...
In some cases Facebook doesn't send back a user's email. In this
case, allow the user to enter their email address.
See
https://meta.discourse.org/t/facebook-initial-login-create-account-dialog-leaves-email-field-blank/13815/15
2014-12-08 12:43:06 +02:00
Sam
3547c20aa7
add toolbar to pick emoji family, bump up number to 60
2014-12-08 16:45:24 +11:00
Sam
23163422e6
correct positioning when emoji is added
2014-12-08 14:22:54 +11:00
Sam
555b783864
Add shortcuts support for emoji toolbar
...
(CTRL E to open, ESC to close)
2014-12-08 13:32:26 +11:00
Sam
c5e07aa320
refactor emoji into 3 files, start flagging composer bits with the api
2014-12-08 12:51:13 +11:00
Sam
abf6871de6
Merge pull request #3027 from techAPJ/update-translations
...
Add missing translation files and update translations
2014-12-08 11:04:17 +11:00
Sam
fdecd69228
Merge pull request #3026 from oblakeerickson/legacy_avatar
...
Remove legacy avatar code
2014-12-08 11:03:55 +11:00
Sam
a7659490c6
Merge pull request #3028 from tytkal/arabic_support
...
Arabic support
2014-12-08 11:03:12 +11:00
Sam
4082076e0d
Merge pull request #3029 from bear-metal/master
...
Introduce support for being able to dump Rails heap after script/bench.rb runs
2014-12-08 11:01:08 +11:00
Lourens Naudé
2f75078758
Do not assume all interpreter versions support allocation tracing
2014-12-07 23:28:38 +00:00
Régis Hanol
fe007d08b3
FIX: remove links and html 'hellips' from topic/post summaries
2014-12-08 00:23:53 +01:00
Lourens Naudé
fb60daa867
Introduce support for dumping Rails process heap at the end of a benchmark run
2014-12-07 22:55:37 +00:00
Lourens Naudé
c273a6d1d4
Rails -> Ruby verbiage change in script/measure.rb
2014-12-07 22:55:37 +00:00
khalid al-hussayen
7bd0458c71
add arabic local files
2014-12-07 23:06:25 +03:00
khalid al-hussayen
9fc0a3f6f9
add arabic local files
2014-12-07 23:05:24 +03:00
Arpit Jalan
45c2a24075
Update Translations
2014-12-07 22:32:13 +05:30
Blake Erickson
e9e88c9b82
Remove legacy avatar code
...
- Remove method that was only left around because the
[api](https://github.com/discourse/discourse_api/pull/53 ) called it
- Modify test to use new route instead of legacy route
https://meta.discourse.org/t/legacy-route-for-avatars/22838/2
2014-12-07 06:13:14 -07:00
Sam
a4ce039c85
demock spec
2014-12-07 18:11:38 +11:00
Sam
87e9510bb0
update nokogiri
2014-12-07 18:11:08 +11:00
Sam
c05203d449
typo
2014-12-07 16:43:26 +11:00
Sam
16c2562e57
Add more logging aroung blank posts
2014-12-07 16:39:30 +11:00
Régis Hanol
929ff00741
FIX: use excerpt instead of the summary
2014-12-06 18:48:39 +01:00
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
