Commit graph

6457 commits

Author SHA1 Message Date
Sam
e8aa85d783 FEATURE: unread pms go in front of notification report
also refactor fat controller
2014-02-13 17:27:50 +11:00
Sam
4ff6780758 Merge pull request #1935 from eriko/remove_cas
Remove cas
2014-02-13 17:26:20 +11:00
Sam
81a4b4d97e Merge pull request #1939 from lukemelia/patch-1
Fixed typo in test name
2014-02-13 17:15:49 +11:00
Sam
f156f173fd Merge pull request #1941 from mpakus/master
Update puma.rb fixed: num_worker(S)
2014-02-13 17:15:03 +11:00
Jeff Atwood
39280a5b0c Merge pull request #1940 from awesomerobot/master
adding style for full-name on topic post user meta data
2014-02-12 21:47:31 -08:00
Ibragimov "MpaK" Renat
a04e4f388b Update puma.rb fixed: num_worker(S) 2014-02-13 11:08:27 +07:00
Kris Aubuchon
7b53efe356 adding style for full-name on topic post user meta data 2014-02-12 21:39:37 -05:00
Kris Aubuchon
70c911018b adding style for full-name in user meta on posts 2014-02-12 21:32:47 -05:00
Sam
5d7a33a799 BUGFIX: flag topic broke all liking on the sites 2014-02-13 12:56:31 +11:00
Robin Ward
f73a3f252a FIX: Don't allow parent categories to be deleted. Also, remove
duplicated logic and rely on the server response for `can_delete`
status.
2014-02-12 17:24:25 -05:00
Robin Ward
a963dd9081 Support embeddable_host values that contain a HTTP/HTTPs protocol 2014-02-12 15:56:06 -05:00
Luke Melia
e4ff06baad Fixed typo in test name 2014-02-12 15:24:44 -05:00
Neil Lalonde
6ceb4f2656 Update admin quick start guide 2014-02-12 14:50:08 -05:00
Robin Ward
a929eda8ba NEW: Add user name and title to group posts. 2014-02-12 14:23:10 -05:00
Robin Ward
669247977b FEATURE: Show the posts count on the groups page. It seems a bit odd
that it uses a new AJAX call, but I wanted to keep the count separate
from the group object itself.
2014-02-12 14:01:36 -05:00
Neil Lalonde
6bbc3ec3e0 Add a way to flag a topic 2014-02-12 12:57:55 -05:00
Robin Ward
11ee4e7328 FIX: Incorrect doc change. Thanks @riking 2014-02-12 12:29:09 -05:00
Robin Ward
318e692290 FIX: If there is an exception when parsing one email, don't stop all
work, return an error code and continue.
2014-02-12 12:08:34 -05:00
Erik Ordway
98bac3b57d Purge settings and .en.yml translations. 2014-02-12 08:38:19 -08:00
Robin Ward
62592215f4 FIX: Testing environment did NOT like Discourse.URL 2014-02-12 11:31:11 -05:00
Robin Ward
721472dab4 FIX: Clicking the logo was not scrolling to the top 2014-02-12 11:03:04 -05:00
Sam
22af3fe085 FEATURE: muted categories should not be missing from drill down 2014-02-12 17:01:13 +11:00
Sam
9ec52d9425 BUGFIX: mailing list mode broke regular email 2014-02-12 16:51:26 +11:00
Sam
4803d387bc BUGFIX: another broken rss page when it includes system user 2014-02-12 14:29:58 +11:00
Sam
03619917f0 BUGFIX: rails is choking on userpage_url for System user, breaks rss 2014-02-12 14:08:09 +11:00
Jeff Atwood
9b57501bfc Merge pull request #1936 from awesomerobot/master
various css fixes
2014-02-11 18:36:59 -08:00
Sam
6fbd73d0eb include rb_trace to help debugging any hanging specs 2014-02-12 13:33:24 +11:00
Sam
71a38542a4 FEATURE: automatic orphan recovery
BUGFIX: improve scheduler robustness, in case redis is disconnected during operation

If sidekiq is terminated while task is running, it will be picked up and ran again
New owner on tasks to help debugging
better #stop semantics for tests
2014-02-12 13:33:24 +11:00
Erik Ordway
8fc5c66c55 this needs to go but did not show up in my tests but did on travis 2014-02-11 18:13:24 -08:00
Kris Aubuchon
dd4d1eddd4 loading bg fix, watching/heatmap color fix, welcome sticky bg fix, user popup drop-shadow fix 2014-02-11 21:03:25 -05:00
Erik Ordway
557d1886bb remove what little CAS testing there was. 2014-02-11 17:53:20 -08:00
Erik Ordway
1167b5c4b5 I can see this on git hub but it is being missing by the test 2014-02-11 17:25:54 -08:00
Erik Ordway
f1e8bdaee5 Remove cas auth from core and convert the settings over so they can be used by the plugin 2014-02-11 15:57:08 -08:00
Erik Ordway
34f9e17eac Allow plugins to specify the value used for require statements. This allows using forked gems in plugins until the original gem gets updated. 2014-02-11 15:53:54 -08:00
Robin Ward
2e5413437d Fix the build 2014-02-11 18:01:06 -05:00
Jeff Atwood
3ef65fffb8 clarify _to_block_new_user settings 2014-02-11 14:43:37 -08:00
Robin Ward
ef16c08688 Don't show group title under poster, only show actual title, but link it
to the group.
2014-02-11 17:34:44 -05:00
Robin Ward
3d62df51a6 FIX: Broken MDTest + Fix for removing leading spaces in a code block 2014-02-11 17:27:24 -05:00
Régis Hanol
7a85e06119 BUGIX: no draft key when creating a topic from the /top page 2014-02-11 13:51:21 -08:00
Jeff Atwood
cf6f983523 Merge pull request #1934 from awesomerobot/master
fixing the user column width bug on smaller browser widths
2014-02-11 13:03:21 -08:00
Kris Aubuchon
c24c60e33f fixing the weird user space column bug on smaller browser widths 2014-02-11 16:00:59 -05:00
Robin Ward
d98fee5fd4 Merge pull request #1918 from fabricioflores/master
added translations to spanish
2014-02-11 15:50:46 -05:00
Robin Ward
b035c050d2 Merge pull request #1920 from nickborromeo/list-controller
Extract queries to keep logic in the Categories Model
2014-02-11 15:48:20 -05:00
Robin Ward
4dc24c6a77 Merge pull request #1925 from slainer68/cors_config
Use GlobalSetting to enable CORS at application level
2014-02-11 15:46:48 -05:00
Robin Ward
1e374e1958 Merge pull request #1926 from awesomerobot/master
now that wbr tags are inputted, breaking usernames a bit more natually
2014-02-11 15:43:41 -05:00
Robin Ward
80bdc6e430 Merge pull request #1929 from verg/fix_category_in_drafts
FIX: restore category when opening draft
2014-02-11 15:42:48 -05:00
Robin Ward
d44d2b3f10 FIX: Was not resuming scroll position on back button 2014-02-11 15:17:36 -05:00
Robin Ward
14f075e812 Missing semicolon; 2014-02-11 14:57:14 -05:00
Régis Hanol
b512afe5c9 BUGFIX: make sure we bind the uploader only once 2014-02-11 10:38:41 -08:00
Régis Hanol
4a20384b56 fix the build 2014-02-11 10:18:07 -08:00