Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #569: Merge Bramble with upstream Adobe Brackets (1.9 dev) #588

Merged
merged 16 commits into from
Feb 16, 2017
Merged

Fix #569: Merge Bramble with upstream Adobe Brackets (1.9 dev) #588

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
851a257
Fix #569: Merge Bramble with upstream Adobe Brackets (1.9 dev)
humphd Feb 9, 2017
9c84eab
Fixes for eslint errors, modifications for browser-based eslint env
humphd Feb 13, 2017
7bb833a
Fix filer filesystem call signature for watchRoot to allow filterGlob…
humphd Feb 13, 2017
80015c5
Merge branch 'master' into merge-master-brackets1.9
humphd Feb 13, 2017
caae06b
Fix build process to not break on \n and to skip npm-shrinkwrap insta…
humphd Feb 13, 2017
b67d789
Fix Gruntfile and localization scripts to pass build, fixes https://g…
humphd Feb 13, 2017
ad749b6
Fix console errors related to registering commands without names
humphd Feb 14, 2017
26415e9
Don't run npm-install grunt task
Feb 14, 2017
cafc521
Merge pull request #1 from gideonthomas/brackets1.9
humphd Feb 14, 2017
f852f01
Revert changes to bramble-move-file/main.js so right-click menu works.
humphd Feb 15, 2017
d4071c3
Use full tern defs files from node_modules, don't preprocess for bett…
humphd Feb 15, 2017
cf93ccc
Update sw cache list, remove stylus mode for CodeMirror
humphd Feb 15, 2017
368b12e
Clean-up unneeded parts of Gruntfile, update uglify dep
humphd Feb 15, 2017
95bdac5
Revert adobe/brackets "Add cut/copy/paste to the context menu" which
humphd Feb 16, 2017
d43c1b9
Deal with Alt-W keybinding conflict between file.Close and pane switc…
humphd Feb 16, 2017
993650f
Update grunt-contrib-compress to latest, dump our old forked version
humphd Feb 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"no-multi-str": 2,
"no-fallthrough": 2,
"no-proto": 2,
"no-script-url": 2,
"no-script-url": 1,
"no-shadow": 0,
"no-shadow-restricted-names": 2,
"no-new-func": 2,
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ module.exports = function (grunt) {
/*'cssmin',*/
/*'uglify',*/
'copy:dist',
'npm-install',
// 'npm-install',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's git so you can always get this line back. If this isn't a work-in-progress PR, might as well just remove the line (and the commented lines above maybe?)

'cleanempty',
'usemin',
'build-config'
Expand Down
2 changes: 1 addition & 1 deletion templates/strings.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

define({
{% for key, string in localizedStrings %}
"{{ key }}": "{{ string | dump }}"{{ "" if loop.last else "," }}
"{{ key }}": "{{ string | replace('\n', '\\n') }}"{{ "" if loop.last else "," }}
{%- endfor %}
});