Commit graph

8150 commits

Author SHA1 Message Date
Robin Ward
aa9a8aa217 Merge pull request #2327 from fantasticfears/patch-3
One more line for more space in new version email
2014-05-09 12:03:10 -04:00
Robin Ward
842dd91958 Revert "Merge pull request #2304 from techAPJ/speech-bubble-update"
This reverts commit 6590ebbcbe, reversing
changes made to 3855ead62e.
2014-05-09 12:01:36 -04:00
Robin Ward
6590ebbcbe Merge pull request #2304 from techAPJ/speech-bubble-update
Speech bubble waiting for an ajax response prior to rendering
2014-05-09 11:58:57 -04:00
Robin Ward
3855ead62e ES6: Some more controllers 2014-05-09 11:57:39 -04:00
Jeff Atwood
853bbbbf06 suppress reply-to-tab borders 2014-05-09 08:42:07 -07:00
Régis Hanol
978fb7ff96 Merge pull request #2328 from ligthyear/better-debugging-of-promises-in-dev
Log the actual promise object instead of a useless name
2014-05-09 11:25:44 +02:00
Benjamin Kampmann
41f1c70fe4 Log the actual promise object instead of a useless name
- console.log has support for objects including introspection, use this
 - instead of logging useless names
2014-05-09 11:16:56 +02:00
Sam
084ec87850 FEATURE: admins can invite users to groups via the web UI 2014-05-09 18:22:36 +10:00
Sam
3f07c1d0a1 Backend support for group invites 2014-05-09 18:22:35 +10:00
Sam
34d1668f9f FEATURE: backend for inviting a user to a group 2014-05-09 18:22:35 +10:00
Erick Guan
f2fd38a7b8 One more line for more space in new version email 2014-05-09 15:02:22 +08:00
Arpit Jalan
d16974fd4c Speech bubble waiting for an ajax response prior to rendering 2014-05-09 08:06:56 +05:30
Robin Ward
77d68ccf08 FIX: Robin is fired for the typo 2014-05-08 16:44:32 -04:00
Robin Ward
44ed0d5232 FIX: Even more safety, the topic must exist as well. 2014-05-08 16:41:25 -04:00
Robin Ward
5fb962a65f FIX: Some extra safety - in the case that an imported post was deleted,
don't error out of the PollFeed job
2014-05-08 16:27:17 -04:00
Robin Ward
773cf60224 FIX: Missing close paren 2014-05-08 16:04:48 -04:00
Robin Ward
5323d3fc29 FIX: Upgrade Onebox to get more amazon URLs and youtube 500 error fix 2014-05-08 14:34:00 -04:00
Robin Ward
bc8f3b1de6 Try again to remove gem 2014-05-08 12:05:06 -04:00
Robin Ward
5ca6d0d750 Revert "Should not use the module transpiler gem"
This reverts commit 7ea427a4c6.
2014-05-08 12:01:55 -04:00
Robin Ward
7ea427a4c6 Should not use the module transpiler gem 2014-05-08 11:51:39 -04:00
Robin Ward
0e296e767a Remove unused stuff. 2014-05-08 11:35:34 -04:00
Robin Ward
804a489c7b ES6: More controllers 2014-05-08 11:35:34 -04:00
Robin Ward
efcf99c21d ES6: A bunch more controllers 2014-05-08 11:35:34 -04:00
Robin Ward
a0221ce5e5 ES6: More controllers converted to ES6 2014-05-08 11:35:34 -04:00
Robin Ward
4640b9d653 ES6: Half a dozen more controllers converted 2014-05-08 11:35:34 -04:00
Robin Ward
5191acfd9f ES6: Uses proper normalize method, includes support for namespaced
controllers.
2014-05-08 11:35:33 -04:00
Robin Ward
eee5f85654 ES6: AvatarSelector and HeaderController - also includes support for controllers with
camelcase via an error message.
2014-05-08 11:35:33 -04:00
Robin Ward
a4e30e8f93 Proof of concept: Load controller via ES6 module in Discourse 2014-05-08 11:35:33 -04:00
Robin Ward
c3ccc3e309 Transpile ES6 even without node, just using rubyracer 2014-05-08 11:35:33 -04:00
Sam
dddb2e19fc Rails 4.1 API change 2014-05-08 15:22:02 +10:00
Sam
ffd18ca0ca BUGFIX: smoke test regression due to anon button moving 2014-05-08 14:47:54 +10:00
Sam
cec18aba3f Rails 4 upgrade 2014-05-08 14:47:54 +10:00
Sam
31c575687b memory_profiler should be shipped with mini profiler 2014-05-08 14:47:54 +10:00
Robin Ward
fbda9cac69 FIX: Reply as new topic was broken 2014-05-07 23:28:14 -04:00
Sam
e6418cd582 Merge pull request #2324 from kohenkatz/bugfix/puma-socket-name
Fix Puma socket name
2014-05-08 12:42:09 +10:00
Sam
e76304cf66 Merge pull request #2325 from kohenkatz/master
Prevent IE Compatibility Mode
2014-05-08 12:26:05 +10:00
MK
620e8aa73d Prevent IE Compatibility Mode
As discussed at https://meta.discourse.org/t/ie10-user-is-getting-your-browser-is-too-old/15289
2014-05-07 22:16:20 -04:00
MK
baafa15bc3 Fix Puma socket name
As mentioned in f784a188c6 (commitcomment-5277066)
2014-05-07 21:58:49 -04:00
Jeff Atwood
1d98d70834 update new version email with release notes too 2014-05-07 17:31:44 -07:00
Jeff Atwood
a40cf28423 update new version email copy 2014-05-07 16:36:35 -07:00
Sam
0c2c92978d Merge pull request #2301 from vikhyat/accessibility
Slightly improve header accessibility
2014-05-08 09:23:29 +10:00
Sam
4025591a1d Merge pull request #2307 from alxndr/latest-topics-rss-title-tweak
change title in Latest Topics RSS feed title
2014-05-08 09:21:06 +10:00
Sam
b144ad4e5b Merge pull request #2314 from fantasticfears/fix_notification_level
Add regular notification level into topic_view_serializer
2014-05-08 09:17:40 +10:00
Sam
a2e2d0e886 Merge pull request #2316 from mutiny/refactor-where-first
Refactor `where(...).first` to `find_by(...)`
2014-05-08 09:10:45 +10:00
Régis Hanol
f9e49624b2 BUGFIX: button styling on /top page 2014-05-08 00:47:10 +02:00
Sam
d648b04eef forgot to reconnect logster post fork 2014-05-08 08:05:28 +10:00
Sam
0334179c6e give logster its own redis connection 2014-05-08 06:52:59 +10:00
Régis Hanol
22d3bb1dd0 Merge pull request #2320 from shime/master
fix inconsistency with bookmark icon label under post
2014-05-07 21:48:04 +02:00
Robin Ward
3525c06751 Update Rails to 4.0.5 2014-05-07 14:56:21 -04:00
Régis Hanol
fafc5d9006 Merge pull request #2321 from awesomerobot/master
minor user(and group) page fixes
2014-05-07 19:59:28 +02:00