Commit Graph

6469 Commits

Author SHA1 Message Date
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
Sam e2d2a955dc BUGFIX: remove hidden posts from a users stream 2014-02-11 17:16:58 +11:00
Sam 7ad00f426c FEATURE REMOVAL: persona login
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
2014-02-11 16:56:48 +11:00
Kris Aubuchon 3b71f8af3a fixing restricted badge padding in the dropdown menu 2014-02-11 00:53:14 -05:00
Kris Aubuchon 6d47fabec7 fixing restricted badge padding 2014-02-11 00:46:17 -05:00
Kris Aubuchon 24f1832cca Merge remote-tracking branch 'upstream/master' 2014-02-11 00:44:10 -05:00
Sam fd34932068 use discourse redis, not redis 2014-02-11 16:11:51 +11:00
Sam 57ee244394 Bump up consistency check to run twice a day instead of once 2014-02-11 16:11:40 +11:00
Sam 11e962c848 BUGFIX: improve quality of unread / new counters 2014-02-11 15:28:05 +11:00
Sam 4a35d055bc correct spec to account for category definition topics 2014-02-11 10:50:14 +11:00
Sam 750d3a6b18 BUGFIX: ensure topic_view exists before attempting to access it 2014-02-11 10:23:47 +11:00
Sam 8a4b603bfd rails master upgrade 2014-02-11 10:22:15 +11:00
Sam 820fe572ca BUGFIX: phantom new and unread for category definition topics 2014-02-11 10:22:15 +11:00
Robin Ward ca17f8a437 FIX: Wrong text. Thanks @riking 2014-02-10 17:36:13 -05:00
Robin Ward 14449f236a FIX: Back button in chrome on static pages 2014-02-10 17:07:39 -05:00
Robin Ward b61df08d1b FEATURE: Admin selector to choose a primary group for a user, display it
and apply a CSS class to their posts.
2014-02-10 17:00:15 -05:00
Sam c97481623d Merge pull request #1928 from velesin/post_creator_refactoring
Refactors PostCreator.
2014-02-11 08:38:08 +11:00
verg dd7fa2d946 FIX: restore category when opening draft 2014-02-10 15:30:08 -05:00
Wojciech Zawistowski 2a7b609cae Refactors PostCreator. 2014-02-10 20:29:31 +01:00
Robin Ward f1a9e52d7e When creating/editing a category the parent shoudl be none. 2014-02-10 14:08:16 -05:00
Robin Ward 45afed8720 FIX: Chrome has a bug where if you request the same URL with a different
MIME type, then leave and hit the back button, you'll get the last MIME
type requested instead of HTML. This fixes it.
2014-02-10 12:43:17 -05:00
Robin Ward b61b33c0fa Add groups list to the poster expansion when you click an avatar while
in a topic.
2014-02-10 12:30:36 -05:00
Robin Ward 25070dcde7 FIX: Show the renamed uncategorized name instead of "(no category)" 2014-02-10 11:15:42 -05:00
Kris Aubuchon dec7a9b998 now that wbr tags are inputted, breaking usernames a bit more natually 2014-02-10 09:45:35 -05:00
slainer68 a89018db87 Use GlobalSetting to enable CORS at application level 2014-02-09 23:11:52 -08:00
Jeff Atwood c900ee055b Merge pull request #1924 from awesomerobot/master
simplfying color palette, collecting colors into unified variables
2014-02-09 22:34:25 -08:00
Kris Aubuchon 2d872795d6 simplfying color palette, collecting colors into unified variables 2014-02-10 01:04:21 -05:00
Sam 4f6cef01e4 fix build 2014-02-10 16:07:09 +11:00
Sam 172d0ffd08 oops clean gemfile lock 2014-02-10 15:43:53 +11:00
Sam 212ece3e80 Remove memory profiler at least until I push a new docker image 2014-02-10 15:40:32 +11:00
Sam d3b8ec36d0 warning if running an old version of bundler 2014-02-10 15:34:08 +11:00
Sam 5d0cae2dd1 BUGFIX: seen logic was incomplete, you can have user_data and still unseen topic 2014-02-10 15:27:46 +11:00
Sam ca170e4636 Add memory profiler gem for ruby 2.1 2014-02-10 15:27:46 +11:00
Fabricio Flores 5569f52f70 Update client.es.yml 2014-02-09 20:51:01 -05:00
Sam a8faac5f0a Merge pull request #1912 from davidcelis/include-rails-binstubs
Include binstubs generated by Rails 4
2014-02-10 12:35:24 +11:00
Sam de9e1a5049 BUGFIX: allow sorting prior to sidekiq starting 2014-02-10 09:21:46 +11:00
Robin Ward f4e3ec905c Merge pull request #1923 from rjackson/security-update-for-ember
Update Ember for CVE-2014-0046.
2014-02-09 11:25:07 -05:00
Robert Jackson 7acef17a35 Update Ember for CVE-2014-0046. 2014-02-09 11:10:14 -05:00
Régis Hanol dd5a25b676 Merge pull request #1921 from joallard/locale-fr
Locales/fr: Add filter strings and change :read_more_MF
2014-02-08 16:21:04 -08:00