Sam
e5f8297670
Merge pull request #928 from jd-erreape/master
...
Refactored some class methods to scopes in order to achieve a better 'Rails way'
2013-05-30 21:31:53 -07:00
Neil Lalonde
42714b424f
For 403 errors, show the same html page as 404
2013-05-30 16:39:39 -04:00
Chris Hunt
afa519b3ae
Only pass searchContext type, id in search request
2013-05-30 12:54:34 -07:00
Juan de Dios Herrero
807f763fb0
Merge remote-tracking branch 'upstream/master'
2013-05-30 21:42:26 +02:00
DI2uNk
24e32092e7
Refactored two class methods into scopes (to achieve a better 'rails way')
...
Also added some tests to the methods
2013-05-30 21:21:31 +02:00
Neil Lalonde
b82a5dfd56
Move logic to reject slugs that are just numbers into the slug module
2013-05-30 11:54:02 -04:00
Neil Lalonde
7d5c313456
Don't allow category slugs that are numbers
2013-05-30 11:09:09 -04:00
Neil Lalonde
5d444be72b
Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number
2013-05-30 10:39:15 -04:00
Sam
3898d90142
fix bugs with sync being wonky
2013-05-30 20:44:53 +10:00
Sam
d20056ad0e
correct watcher, live updates for unread
2013-05-30 16:49:58 +10:00
Sam
6ad86aa305
read state is now published
2013-05-30 16:49:58 +10:00
Sam
8874c9ea75
Add message format support that can be used on complex localization strings
...
Add message about new and unread topics at the bottom of topics
move localization helper into lib
2013-05-30 16:49:57 +10:00
Sam
e93b7a3b20
more progress towards live unread and new counts, unread message implemented, still to implement delete messages
2013-05-30 16:49:57 +10:00
Sam
f2da06a78f
gmefile lock
2013-05-30 16:49:57 +10:00
Sam
90167e427b
highlight logic changed
2013-05-30 16:49:57 +10:00
Sam
73834370a5
work in progress, live unread and new counts
2013-05-30 16:49:57 +10:00
Sam
33683715a9
work in progress live unread / new counts
2013-05-30 16:49:57 +10:00
Sam
33ff87bf44
work in progress, live unread / new counters
2013-05-30 16:49:57 +10:00
Sam
4e2c6f43d1
correct broken pm draft
2013-05-30 08:55:23 +10:00
Robin Ward
830b93a16b
Reduced complexity of admin flags controller, split up into methods, moved reports into model.
2013-05-29 16:49:34 -04:00
Robin Ward
5ae7707000
Refactor: Convert repeated {{view Discourse.xyz}} to registered view helpers
2013-05-29 15:14:31 -04:00
Robin Ward
57d5355ce8
wat
2013-05-29 15:00:35 -04:00
Robin Ward
4d5c145198
Refactor: Adds Discourse.Utilities.registerViewHelper
to register view helpers
2013-05-29 14:32:39 -04:00
Robin Ward
3d0587d8ce
Refactor: move category slug helper to Category model
2013-05-29 14:18:02 -04:00
Robin Ward
fe3ac50aae
Use {{aceEditor}}
helper to display the ace editor
2013-05-29 14:09:21 -04:00
Robin Ward
0601bb6d74
Trivial JS clean up
2013-05-29 14:09:17 -04:00
Neil Lalonde
6abd9ddd2d
Add warning on admin dashboard if production env is configured to send email through gmail
2013-05-29 14:00:35 -04:00
Robin Ward
acb2623b4b
JSHINT: extra comma
2013-05-29 13:30:03 -04:00
Robin Ward
9717a344c3
Refactor: Less reliance on views for logic for topic list
2013-05-29 13:28:07 -04:00
Robin Ward
4cf1d9c266
Display details about the search context in the placeholder
2013-05-29 12:19:31 -04:00
Neil Lalonde
b1bdebd611
url for uncategorized category topic list is always /category/uncategorized
2013-05-29 12:06:33 -04:00
Robin Ward
f151b30044
Show excerpts on Categories page
2013-05-29 11:46:01 -04:00
Robin Ward
2e26fca36b
FIX: Hitting ESC while autocomplete is open shouldn't close the composer.
2013-05-29 11:28:41 -04:00
Robin Ward
5cb1cc6fcb
FIX: Categories pill wasn't always being highlighted properly.
2013-05-29 11:02:37 -04:00
Robin Ward
27c1f1044c
FIX: Regression, messages were hidden
2013-05-28 21:24:45 -04:00
Robin Ward
92dc59fba9
Properly assign draft keys to Categories List view.
2013-05-28 21:16:24 -04:00
Sam
46389754d6
Merge pull request #892 from eriko/cas_support
...
Cas support
2013-05-28 16:13:29 -07:00
Robin Ward
d75b160385
Enable subscribing to notifications on start, instead of currentUser
...
change which was hokey.
2013-05-28 17:12:37 -04:00
Robin Ward
fc7fefb581
Merge pull request #913 from chrishunt/chrishunt/style-api-button
...
Add styling to 'Generate API Key' button
2013-05-28 13:26:30 -07:00
Robin Ward
c73455bfa2
FIX: Missing ()
made notifications invisible
2013-05-28 16:17:32 -04:00
Robin Ward
ee319ea7f7
FIX: Issues that didn't show up originally
2013-05-28 15:57:11 -04:00
Neil Lalonde
264dd65410
Fix replying in a topic that is uncategorized after allow_uncategorized_topics is set to false
2013-05-28 15:53:01 -04:00
Robin Ward
560fb15d8a
Include pinned topics in category list.
...
- removes an (n+1) query for user data
- supports the preload store for the data to avoid a second request
- fix a bug where uncategorizes was reporting (0, 0, 0) for topics by week, month, year
2013-05-28 15:36:16 -04:00
Chris Hunt
e75f881d58
Add styling to 'Generate API Key' button
2013-05-28 12:10:18 -07:00
Neil Lalonde
dda831fd41
Fix a regression that broke pre-fill of username when sending private message
2013-05-28 14:17:35 -04:00
Robin Ward
320b35bf90
Merge pull request #910 from novemberkilo/master
...
WIP - Reduce complexity of Post#raw_links
2013-05-28 10:07:41 -07:00
Robin Ward
8d47f92c27
Merge pull request #908 from chrishunt/chrishunt/extract-topic-status-update
...
Extract topic status update
2013-05-28 10:00:49 -07:00
Neil Lalonde
f190a96b30
Allow stuff in gutter to be selected
2013-05-28 12:57:33 -04:00
Neil Lalonde
a4b90ac54f
Prevent avatars from wrapping on topic list
2013-05-28 12:57:32 -04:00
Chris Hunt
21a54567ff
Extract TopicStatusUpdate from Topic
2013-05-28 09:01:04 -07:00