Commit graph

6607 commits

Author SHA1 Message Date
Robin Ward
f19b0b5fe0 Include members count on groups page. 2014-02-18 16:17:04 -05:00
Robin Ward
535c6b272f FIX: Update onebox gem to bring back wordpress oneboxing 2014-02-18 16:04:40 -05:00
Neil Lalonde
997a7c676e If flagging a topic with only one post, flag the post instead 2014-02-18 15:18:31 -05:00
Robin Ward
1a8ebb710e Rollback faraday gem to fix conflicts 2014-02-18 13:50:00 -05:00
Robin Ward
3f3c07f136 FEATURE: Can bulk update the notification level of topics 2014-02-18 13:02:22 -05:00
Neil Lalonde
d0ecccb7e4 Translate asterisks in ip addresses to mask format so people can enter things like 127.*.*.* in screened ip addresses form 2014-02-18 13:00:55 -05:00
Régis Hanol
69e0342d8f fix typo 2014-02-18 18:24:11 +01:00
Régis Hanol
74f1db11e9 remove useless binding 2014-02-18 18:23:28 +01:00
Régis Hanol
30ccdf3fb7 BUGFIX: calling _super() won't actually set the model to the controller
cf.
351719f7c1 (commitcomment-5410366)
for more information
2014-02-18 18:21:35 +01:00
Neil Lalonde
6c23a1903e FIX: show ip address with mask again on /admin/logs/screened_ip_addresses 2014-02-18 10:33:08 -05:00
Sam
38004fc218 hold back image optim due to svg issue 2014-02-18 20:30:54 +11:00
Sam
884346cbea Merge pull request #1951 from thoughtbot/bb-erb
Use ERB to pull conf files into app
2014-02-18 16:23:55 +11:00
Sam
887e835a9b Merge pull request #1969 from riking/scroll-position
Put requested post in middle of page
2014-02-18 16:17:26 +11:00
Sam
983c7567aa BUGFIX: seen recently key needs to be public so mock can easily reach in to it 2014-02-18 16:09:24 +11:00
Sam
aa3096141a fix up gemfile 2014-02-18 16:02:59 +11:00
Sam
6f759b4a6a Update Gems 2014-02-18 16:02:28 +11:00
Sam
c4f2e49b85 move patching to better spot 2014-02-18 15:58:56 +11:00
Sam
f617086e91 FIX oobgc support for Ruby 2.1 2014-02-18 14:43:24 +11:00
Sam
a6f4d00670 Add oobgc compatible with Ruby 2.1 2014-02-18 14:10:03 +11:00
Sam
a74c67e305 Update unicorn to latest 2014-02-18 14:10:03 +11:00
Sam
a28a0bbeeb PERF: stop messing with strings that come back from I18n.t
allows better caching
2014-02-18 14:10:03 +11:00
Sam
a5e3e9ae2a Added markov emoji for turtle rock 2014-02-18 14:10:03 +11:00
Sam Saffron
057d8b2b42 Add some Ruby 2.1 specific Gems, get people to upgrade bundler 2014-02-18 13:24:42 +11:00
Sam Saffron
78bfa29b85 BUGFIX: rails 3 removal downgraded message bus 2014-02-18 12:43:25 +11:00
riking
19922ff174 Have keyboard_shortcuts use Discourse.TopicView.jumpToPost
Instead of _scrollList, which is more appropriate on the topic list.
2014-02-17 16:45:36 -08:00
riking
ebb001c24a When entering a topic, place the desired post in the middle of the page 2014-02-17 16:38:01 -08:00
Sam
6360868341 Merge pull request #1968 from stephankaag/drop_rails3
Drop Rails3 support
2014-02-18 10:50:36 +11:00
Régis Hanol
351719f7c1 BUGFIX: do not forget Ember's default behavior 2014-02-17 21:58:28 +01:00
Régis Hanol
f81680d5c7 BUFGIX: we should have uploads in the backup 2014-02-17 19:58:50 +01:00
Stephan Kaag
f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Régis Hanol
6f6a8c3f1b dump only the public schema when backing up the db 2014-02-17 19:14:57 +01:00
Régis Hanol
48ac29ae5d Merge pull request #1967 from stackbuilders/more_es_translations
Adding more ES translations
2014-02-17 17:18:32 +01:00
Matt Campbell
ef24882999 Adding additional ES translations 2014-02-17 10:55:08 -05:00
Régis Hanol
e1bb5d8f01 Merge pull request #1965 from florianbeer/master
Adds "bundle exec" prefix to rake tasks
2014-02-17 15:51:40 +01:00
Florian Beer
b88cfc3bb8 Adds bundle exec prefix to rake tasks 2014-02-17 15:47:56 +01:00
Florian Beer
4e9f65f1e1 Adds "bundle exec" prefix to rake tasks 2014-02-17 14:42:46 +01:00
Régis Hanol
aac4b55926 FEATURE: do not redirect to top page when number of topis is low 2014-02-17 14:28:12 +01:00
Régis Hanol
90d20c4373 Merge pull request #1950 from verg/master
Don't render 'Reply' button when user can't post
2014-02-17 14:04:49 +01:00
Régis Hanol
40b8e09122 Merge pull request #1938 from velesin/post_creator_jobs_extraction
Refactors PostCreator.
2014-02-17 09:52:52 +01:00
Régis Hanol
c6cf88470d Merge pull request #1952 from stackbuilders/spanish_translations
Added and updated Spanish translations
2014-02-17 09:49:39 +01:00
Régis Hanol
9e9d03d656 Merge pull request #1957 from lonehangman/site_endpoint
Added endpoint for the 'site' JSON (In the preload store)
2014-02-17 09:49:01 +01:00
Régis Hanol
77e0096142 Merge pull request #1959 from chris-ramon/patch-1
fix typos in posts_controller_spec.
2014-02-17 09:48:04 +01:00
Régis Hanol
35fd03c1e4 Merge pull request #1961 from verg/site_settings_load_top
Scroll to top on Site-Setting category render
2014-02-17 09:47:20 +01:00
Wojciech Zawistowski
b097cf4997 Refactors PostCreator. 2014-02-17 01:57:37 -05:00
lonehangman
739c9688ae Added endpoint for site JSON
Removed unneeded code
2014-02-17 15:16:53 +09:30
Sam
70c50d321a BUGFIX: allow facebook auth for people refusing email 2014-02-17 14:45:17 +11:00
Sam
abb2de22ab BUGFIX: search could break when expanding 2014-02-17 14:34:14 +11:00
Sam
2b10fdc97f FEATURE: search auto scopes on topic first 2014-02-17 13:54:51 +11:00
Sam
0438abf139 BUGFIX: Use ENV["USER"] before falling back to postgres 2014-02-17 10:44:37 +11:00
Sam
73aca9063d FEATURE: allow overriding server static asset if needed 2014-02-17 10:44:37 +11:00