Emili Parreno
5d66241f25
fix conflict
2013-09-05 17:38:38 +02:00
Emili Parreno
4a0f3b3ac2
fix user_controller_spec when testing too long usernames
2013-09-05 17:36:53 +02:00
Neil Lalonde
cde631cbd1
Change default of notify_mods_when_user_blocked to false
2013-09-05 11:27:24 -04:00
Robin Ward
71c1b8b9b9
When deleting a post as staff, ask if you want to delete direct replies too
2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91
Select +Replies for bulk operations
2013-09-05 11:03:29 -04:00
Sam
dba1d79de2
Merge pull request #1413 from eparreno/chore/refactor_spec_helper
...
refactor spec_helper
2013-09-05 05:22:25 -07:00
Emili Parreno
9fdabd3b8a
refactor spec_helper
2013-09-05 13:22:15 +02:00
Emili Parreno
7ef7208c66
fix user_controller_spec when testing too long usernames
2013-09-05 12:50:53 +02:00
Sam
c9321cae7f
Our JS includes belong at the top of the file, that way we can start
...
downloading and parsing them earlier and not wait for the rest of the page
Our noscript stuff belongs at the bottom, we should not hold off any js work
while noscript is downloading
2013-09-05 10:41:11 +10:00
Sam
5b08f73561
give god rights of impersonation to developers, must be edited into the production.rb config file
2013-09-05 10:27:34 +10:00
Sam
4933e9d6ab
todo added to code
2013-09-05 09:33:51 +10:00
Neil Lalonde
d76486a48b
Topic can have null user_id when user was nuked
2013-09-04 15:42:24 -04:00
Neil Lalonde
117fc8db58
Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream.
2013-09-04 15:42:21 -04:00
Robin Ward
1a6170a47c
Merge pull request #1407 from einarj/extract_fake_admin_method
...
Extracted a fake_admin method
2013-09-04 07:59:03 -07:00
Robin Ward
808225f43a
FIX: missing comma
2013-09-04 10:57:31 -04:00
Robin Ward
7dedc773bb
Merge pull request #1408 from riking/patch-1
...
Add "nose" faces to the translations table
2013-09-04 07:53:05 -07:00
Sam
61d3e43744
better split logic for names starting with capitols eg: ABBob should split to AB Bob
2013-09-04 15:02:04 +10:00
Sam
9977f3098c
fast stack needs upgrading, had a bug
2013-09-04 10:40:53 +10:00
Sam
22f2a0c1f4
update rails 4, use log level info in profile for better accuracy
2013-09-04 09:39:16 +10:00
Neil Lalonde
b47eedba00
Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics
2013-09-03 19:12:22 -04:00
Sam
212f1363ae
update fast_stack, to fix gem install issue
2013-09-04 06:45:17 +10:00
Robin Ward
8829e1ae20
Merge pull request #1406 from ZogStriP/content-disposition-s3
...
Content disposition on S3
2013-09-03 07:22:46 -07:00
Robin Ward
0aee25616c
Merge pull request #1409 from ofgeek/patch-2
...
Update client.zh_CN.yml
2013-09-03 07:21:52 -07:00
Robin Ward
0a1a5e2e4a
Merge pull request #1410 from abbat/master
...
Russian translation (actual version)
2013-09-03 07:21:41 -07:00
Sam
9edef9b017
rails 4 mini profiler update
2013-09-03 19:29:17 +10:00
Sam
438dd9759d
latest mini profiler
2013-09-03 19:25:46 +10:00
Sam
7b62f9ccd7
more fixes for rails 4
2013-09-03 19:11:55 +10:00
Sam
5dd199df26
bench fix and new arel patches for rails 4
2013-09-03 18:58:56 +10:00
Sam
ba6576efd1
rails 4 update
2013-09-03 18:32:41 +10:00
Sam
1b9079ed20
centralize logic so mockers stop mocking me
2013-09-03 17:58:56 +10:00
Sam
51eb764345
mini profiler update to use latest flame graph engine
2013-09-03 17:58:56 +10:00
Sam
46d5314ec4
Improve Rails4 performance by 20%, before the median on the page is 53ms, after it is 44ms
2013-09-03 17:58:56 +10:00
Jeff Atwood
f13a408c2a
Omit Needless Words on new user JIT popups
2013-09-02 22:41:54 -07:00
Anton Batenev
529fe32453
Russian translation (actual version)
2013-09-02 18:48:47 +04:00
Sam
6e72eb5042
Merge branch 'master' of github.com:discourse/discourse
2013-09-02 17:19:17 +10:00
Sam
d3c5afbb80
reduce sidetiq frequency
...
remove minutely() schedule that was very inefficient
2013-09-02 17:14:41 +10:00
ofGEEK
ee79a28569
Update client.zh_CN.yml
2013-09-02 10:09:11 +08:00
Jeff Atwood
0089b10e25
remove footer newline from digest emails, is ugly
2013-08-30 23:08:29 -07:00
Kane York
c4ecfad78a
Add "nose" faces to the translations table
...
as per http://meta.discourse.org/t/use-more-standard-smiley-codes-instead-of-smile/1822/44
2013-08-30 22:50:31 -07:00
Jeff Atwood
96313ce742
better copy for repeated URL blocking
2013-08-30 21:09:35 -07:00
Neil Lalonde
d875a9549d
Version bump to v0.9.6.2
2013-08-30 13:41:57 -04:00
Einar Jonsson
e06356ebbe
Extracted a fake_admin method
2013-08-30 17:39:31 +00:00
Robin Ward
46efbac40e
Add "Unread" filter to messages tab. Rename the other two views.
2013-08-30 12:32:05 -04:00
Régis Hanol
9d6cb6aae4
added content-disposition header for uploads on S3
2013-08-30 17:28:18 +02:00
Régis Hanol
1a38f66c7e
removed warning about already existing constants
2013-08-30 17:28:18 +02:00
Robin Ward
232f5bd743
Merge pull request #1403 from einarj/use_topic_delegators
...
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-30 08:15:10 -07:00
Robin Ward
741e50488f
Merge pull request #1405 from gaurish/patch-1
...
Rake Commands can be chained
2013-08-30 08:12:16 -07:00
Robin Ward
63f2187d72
FIX: Don't do intraword italics when prefixed by a forward slash
2013-08-30 10:56:41 -04:00
Robin Ward
df5cbf76e0
Move insideGroup
into the helper, not the class for grouped each
2013-08-30 10:44:34 -04:00
Gaurish Sharma
432f9bf5cf
Rake Commands can be chained
...
We can run all three setup related commands in one go, making it easier for people to copy-paste. Also it would be bit faster, I would imagine.
2013-08-30 18:26:59 +05:30