Sam
d2c1eb090e
Merge pull request #921 from nirnanaaa/postgres-truefalse
...
removed t's and f's from models
2013-05-30 21:38:26 -07:00
Sam
41187a5de1
Merge pull request #931 from ZogStriP/more-file-upload-test-coverage
...
added more file uploads test for better coverage
2013-05-30 21:36:33 -07:00
Régis Hanol
6cc0f8f2d4
added more file uploads test for better coverage
2013-05-31 03:13:37 +02: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
Sam
6ad86aa305
read state is now published
2013-05-30 16:49:58 +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
73834370a5
work in progress, live unread and 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
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
nirnanaaa
364113a4d5
removed t and f 's from group model
...
removed t and f 's from user model as mentioned in #919
removed t's and f's from category model
2013-05-29 22:10:43 +02: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
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
ee319ea7f7
FIX: Issues that didn't show up originally
2013-05-28 15:57:11 -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
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
Chris Hunt
21a54567ff
Extract TopicStatusUpdate from Topic
2013-05-28 09:01:04 -07:00
Erik Ordway
9a409d9440
fix comment and remove url setting as it is not used.
2013-05-28 08:06:18 -07:00
Navin
1d5952a92f
Extract analysis type methods to a module and refactor Post#raw_links
2013-05-28 16:41:18 +02:00
Chris Hunt
54a798eb12
Add Topic#age_in_days for determining age of topic
2013-05-27 18:02:15 -07:00
Sam
d2f2a8e218
refactoring
2013-05-28 09:13:53 +10:00
Robin Ward
62a20f5655
FIX: Couldn't access "Uncategorized" category from category list.
2013-05-27 14:15:52 -04:00
Neil Lalonde
b1ef2ea1e1
Fix TopicPostersSummary when a suggested topic includes a user who has been deleted
2013-05-27 14:12:15 -04:00
Robin Ward
197909246c
Weigh staff likes higher when calculating scores. New site setting: staff_like_weight
...
can set the factor (default is 3)
2013-05-27 12:46:08 -04:00
Robin Ward
e1781240a6
Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse
...
Conflicts:
lib/text_sentinel.rb
2013-05-27 10:42:20 -04:00
Robin Ward
a15910ad1e
Merge pull request #899 from chrishunt/chrishunt/extract-topic-posters-summary
...
Extract topic posters summary
2013-05-27 06:30:58 -07:00
Sam
bf16b4f381
Merge pull request #903 from chrishunt/chrishunt/extract-post-move
...
Extract post move
2013-05-26 19:10:50 -07:00
Chris Hunt
6024529f81
Extract PostMover from Topic into its own class
2013-05-26 18:42:04 -07:00
Sam
d84ae80074
Simplify user action make it more idiomatic
2013-05-27 10:22:37 +10:00
Janis Miezitis
f58bcf7fe3
Refactored duplication in user action
2013-05-26 16:07:20 +03:00
Chris Hunt
b8fbac582e
Add Topic#url for determining url for a Topic
2013-05-25 17:44:32 -07:00
Chris Hunt
f2b5e20840
Add Topic#max_post_number to find max post number
2013-05-25 17:44:32 -07:00
Chris Hunt
c4cce68613
Add Post#is_first_post?
...
We should be able to ask a post if it's the first in a topic
2013-05-25 17:44:32 -07:00
Chris Hunt
63c63c2939
Remove unused parameters from posters_summary
2013-05-24 15:33:50 -07:00
Chris Hunt
c1841a6c89
Extract Topic#posters_summary
2013-05-24 15:33:45 -07:00
Robin Ward
e2774cc2df
Merge pull request #896 from xtream/master
...
Removed unnecesary method
2013-05-24 14:09:44 -07:00
Neil Lalonde
d26b87bd3c
Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics.
2013-05-24 16:56:43 -04:00
Matt Van Horn
e5e904aa4e
minor refactorings
2013-05-24 13:36:33 -07:00
Matt Van Horn
d7817cf314
extract TopicNotifier class from topic
2013-05-24 13:36:33 -07:00
Robin Ward
d1fdc66ca4
FIX: For spam detection, don't count total occurances of links of the same host, but
...
post count including that host.
2013-05-24 15:20:58 -04:00
Victor Cruz Dueñas
bca006feca
removed unnecesary method
2013-05-24 18:03:02 +02:00
Robin Ward
c0c97487d8
Merge pull request #888 from novemberkilo/master
...
Refactor to reduce complexity of Post#save_reply_relationships
2013-05-24 07:04:28 -07:00
Sam
ca2dee52db
moved comments to the bottom, they are way less intrusive there
2013-05-24 12:48:32 +10:00
Sam
2cd95bc649
lets try out annotations
2013-05-24 12:35:14 +10:00
Sam
fc3c93d237
almost fixed the regression of not allowing top level filters
2013-05-24 09:54:39 +10:00
Erik Ordway
0bdee973a0
allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional
2013-05-23 13:44:14 -07:00
Erik Ordway
1575ce7b10
add cas support with a few tests
2013-05-23 13:40:50 -07:00
