Nick O'Leary
6191a49ed3
Use flow-diff to resolve merge conflicts
2018-02-13 23:09:51 +00:00
Nick O'Leary
aa1cf0b228
Avoid git fetch when refreshing local status
2018-02-08 23:30:07 +00:00
Nick O'Leary
06a6a4408f
Handle allow-unrelated-histories option on pull
2018-02-08 23:21:14 +00:00
Nick O'Leary
d5619d2b9d
Fix up merge conflict handling
2018-02-08 22:22:58 +00:00
Nick O'Leary
555b7df986
Handle more git 2.1 differences
2018-02-07 13:47:09 +00:00
Nick O'Leary
b3786700e6
Handle changing case of git error messages between versions
2018-02-07 13:10:04 +00:00
Hiroyasu Nishiyama
ce9643d21b
fix message lookup for core nodes in case of i18 locales directory exists
2018-02-07 21:59:58 +09:00
Nick O'Leary
4a5cb7f2f5
Ensure commit list has a refs object even if empty
2018-02-07 11:33:07 +00:00
Nick O'Leary
42a7e902e6
Handle host key verification as auth error
2018-02-07 11:32:50 +00:00
Nick O'Leary
aebe080e85
Add support for GIT_SSH on older levels of git
2018-02-07 10:50:32 +00:00
Nick O'Leary
415c768ae4
Filter out %D from git log command for older git versions
2018-02-06 11:00:11 +00:00
Nick O'Leary
b4c8bf21d5
Ensure projects are created as logged in user
2018-02-06 10:38:41 +00:00
Nick O'Leary
5fe5db603d
Better error handling/reporting in project creation
2018-02-05 15:59:11 +00:00
Nick O'Leary
d1f7fd8bfd
Prevent http git urls from including username/pword
2018-02-02 22:43:29 +00:00
Nick O'Leary
d21568497b
Avoid exception if git not installed
2018-02-02 13:46:22 +00:00
Nick O'Leary
df4beef060
Check version of git client on startup
2018-02-02 11:37:18 +00:00
Nick O'Leary
67d7930aef
Remember to disable projects in editor when git not found
2018-02-01 20:35:18 +00:00
Nick O'Leary
1377439bb0
Fix pull/push when no tracked branch
2018-02-01 17:08:22 +00:00
Nick O'Leary
407123a280
Add git_pull_unrelated_history handling
2018-02-01 17:07:46 +00:00
Nick O'Leary
750dd590c8
Handle delete of last remote in project settings
2018-02-01 11:25:56 +00:00
Nick O'Leary
d0d93d7070
Handle more repo clone error cases
2018-02-01 10:42:14 +00:00
Nick O'Leary
b847e962aa
Handle project first-run without existing flow file
2018-01-31 21:31:45 +00:00
Nick O'Leary
8672fcd2bb
Fix authServer on Windows path
...
Fixes #1588
2018-01-29 21:47:20 +00:00
Nick O'Leary
519edce0ed
Replace when.otherwise() with Promise.catch()
...
Fixes #1584
2018-01-29 09:51:38 +00:00
Nick O'Leary
0dd7bc7fb9
Better default README.md content and edit button
2018-01-25 13:30:27 +00:00
Nick O'Leary
c43647ca86
Handle null profile flow file name
2018-01-25 11:14:16 +00:00
Nick O'Leary
6d02e70025
Ensure existing files are migrated to first project
2018-01-25 10:13:07 +00:00
Nick O'Leary
b7a0a9d7c2
Merge branch 'master' into 0.18
2018-01-24 23:08:14 +00:00
Nick O'Leary
e250a91f09
Merge branch '0.18' into projects
2018-01-24 23:06:27 +00:00
Nick O'Leary
4b129d94e4
Move node install to spawn to allow for big stdout
...
Fixes #1488
2018-01-24 22:41:26 +00:00
Nick O'Leary
95589307cd
Better reporting of project-not-found
2018-01-24 21:54:18 +00:00
Nick O'Leary
7a89e3cf33
Check the global git config to ensure its setup
2018-01-24 21:05:48 +00:00
Nick O'Leary
64607df929
Ensure git username/email are set on project creation
2018-01-24 15:51:11 +00:00
Nick O'Leary
a62a1012fa
Handle scoped modules via palette editor
2018-01-24 15:07:43 +00:00
Nick O'Leary
cf34716a57
Tidy up project first-run experience
2018-01-23 11:26:05 +00:00
Nick O'Leary
cf40497e6e
Flip logic for opt-in to projects
2018-01-22 23:14:38 +00:00
Nick O'Leary
ad6e55ca17
Allow a user to install missing modules from project settings
2018-01-22 13:46:11 +00:00
Nick O'Leary
7e27dd7678
Don't rely on ssh-keygen output to prevent known errors
2018-01-19 22:31:41 +00:00
Nick O'Leary
c2508296a5
Add debug to sshkeygen
2018-01-19 22:10:29 +00:00
Nick O'Leary
eac98a6d4d
Prevent ssh-keygen prompting for passphrase when blank
2018-01-19 13:12:22 +00:00
Nick O'Leary
7e2b2a9a02
Timeout sshkey-gen calls
2018-01-19 12:57:37 +00:00
Nick O'Leary
353de471eb
Add debug to sshkeygen for travis
2018-01-19 12:50:12 +00:00
Nick O'Leary
d93a92c1c8
Rearrange ssh logic to bring it together
2018-01-18 23:13:55 +00:00
Nick O'Leary
f7f795f58a
Fixup SSH key auth for project repos
2018-01-18 22:17:48 +00:00
Nick O'Leary
f95b414d22
First pass of projects test coverage
2018-01-16 23:04:39 +00:00
Nick O'Leary
b76010cb5a
Add sshkeygen test
2018-01-16 16:38:53 +00:00
Nick O'Leary
52475df783
Fix various tests due to projects rework
2018-01-16 16:18:18 +00:00
Nick O'Leary
25f4a018d9
Merge branch '0.18' into projects
2018-01-16 11:21:54 +00:00
Nick O'Leary
fd4fdb31b5
Better error reporting when module provides duplicate type
2018-01-15 23:20:20 +00:00
Nick O'Leary
1a62a7831b
Handle undefined/null in log functions
...
Fixes #1418
2018-01-14 00:50:58 +00:00
Nick O'Leary
fd9e3fc03a
Update jsonata to 1.4.1
2018-01-13 20:42:23 +00:00
Nick O'Leary
3306d30094
Get proper path to local keyfile when selected
2018-01-11 11:19:04 +00:00
Nick O'Leary
6516e0dfd2
Allow a user to pick existing sshkeys from ~/.ssh
2018-01-10 17:37:41 +00:00
Nick O'Leary
13356047dc
Better handling of empty projects and lifecycle
2018-01-09 15:06:05 +00:00
Nick O'Leary
1c2ea56f42
Allow a project to be specified on the command-line
...
Reuses the existing flowFile - if its value is found
to be the name of an existing project, that project
is set as the active one.
If it is not the name of an existing project, it is
ignored.
2018-01-08 16:10:54 +00:00
Nick O'Leary
1d7ae300e2
Handle cloning a bare repository
2018-01-08 14:46:56 +00:00
Hideki Nakamura
5a6cde1446
Refactoring ssh-keygen function ( #1533 )
2018-01-05 16:12:01 +00:00
Kazuki Nakanishi
63f7d826bc
Enable it to store icon files in {settings.userDir}/lib/icons directory for dynamic nodes's icon feature ( #1536 )
2018-01-05 14:23:47 +00:00
Nick O'Leary
9c350311e8
Fix reauthentication of remote repositories
2017-12-21 17:40:24 +00:00
Nick O'Leary
816442f5f0
Update sshey UI to use common list style
2017-12-20 23:45:17 +00:00
Simon Hailes
6696b6661a
When creating 'redserver' for a node, use runtime.server rather than runtime.adminApi.server, and fill runtime.server at startup with the valid http server regardless of adminApi being available.
...
This resolves websockets not working when the adminApi (httpAdminRoot) is disabled in settings.
2017-12-20 16:04:32 +00:00
Nick O'Leary
8c87478636
Merge sshkeys
2017-12-20 15:12:10 +00:00
Nick O'Leary
d870b072d7
Tidy up branch/remote list in projectSettings
2017-12-20 14:37:34 +00:00
Hideki Nakamura
2ea2af7d2a
Use a fixed string instead of os.hostname()
2017-12-20 19:44:57 +09:00
Nick O'Leary
05f90394db
Flag misconfigured project credentialSecret
2017-12-19 14:00:58 +00:00
Hideki Nakamura
c24b0c6bb4
Change "generateSSHKey" function signature
2017-12-19 22:57:40 +09:00
Nick O'Leary
33a5b84181
Add first-run dialog to migrate files to project
2017-12-19 00:56:02 +00:00
Hideki Nakamura
2a9d0a5e7d
Merge branch 'projects' into sshkey-management
2017-12-17 23:54:44 +09:00
Nick O'Leary
474f4572f2
Fix conditional initialisation of projects
2017-12-16 23:43:08 +00:00
Hideki Nakamura
bf57cb209f
Delete unnecessary logs
2017-12-16 00:46:05 +09:00
Hideki Nakamura
9bc41c1709
Merge branch "projects"
2017-12-16 00:33:08 +09:00
Hideki Nakamura
fe10b8650f
Add Git access feature via SSH and Enhance SSH Key management
2017-12-16 00:07:47 +09:00
Hideki Nakamura
3a311c9584
Detect a SSH key generation error
2017-12-15 23:48:52 +09:00
Nick O'Leary
a3a1bba5ef
Add projects editorTheme flag to disable the feature
2017-12-13 09:44:48 +00:00
Nick O'Leary
bb59cd5742
Allow unstaged files to be reverted
2017-12-11 17:05:12 +00:00
Nick O'Leary
27f1d3b704
Add delete local branch option
2017-12-08 16:31:42 +00:00
Nick O'Leary
d007623347
Return more detailed information on /project/branches api
2017-12-07 22:24:57 +00:00
Hideki Nakamura
6a5cf7a1fa
Merge branch 'projects' into sshkey-management
2017-12-07 23:29:58 +09:00
Hideki Nakamura
3adfe249b0
Support to delete project feature ( #1509 )
...
* First commit to support to delete projects
* Add delete project menu & Implement delete project API
* Correspond to the PR feedback
2017-12-07 14:28:26 +00:00
Hideki Nakamura
923893e160
Add SSH key management API
2017-12-07 23:11:24 +09:00
Nick O'Leary
304c597a2f
Store repo credentials per-user
2017-12-06 22:39:30 +00:00
Hideki Nakamura
3ca0e9c420
Fix the property "users" access error in runtime.start test caces ( #1511 )
2017-12-06 13:20:22 +00:00
Hideki Nakamura
1dd4323613
Fix the errors in credentials test cases ( #1512 )
2017-12-06 13:19:07 +00:00
Nick O'Leary
1840d15397
Restructure how editor/git settings are saved in userSettings
2017-12-05 23:50:32 +00:00
Nick O'Leary
3f6b1f6ccb
Fix loading of userSettings
...
Closes #1505
2017-12-05 16:23:55 +00:00
Nick O'Leary
91352e855a
Handle overwrite warning on local branch change
2017-12-05 16:12:07 +00:00
Nick O'Leary
fff0b15ae5
Add /settings/user end point
2017-12-04 17:15:17 +00:00
Nick O'Leary
a7e14f1093
Handle a local branch that does not yet track a remote
2017-12-04 13:26:47 +00:00
Nick O'Leary
94eeaeb8d3
Allow committer details to be set per-user
2017-12-04 11:42:44 +00:00
Nick O'Leary
64191e8303
Merge master to 0.18
2017-12-03 22:32:28 +00:00
Kazuki Nakanishi
6d2389945b
allow a node's icon to be set dynamically ( #1490 )
...
* create a proto type
* Fixed some problems after reviewing
2017-11-30 13:13:35 +00:00
Nick O'Leary
14c48253f6
Confirm actions that would overwrite dirty workspace
2017-11-24 23:12:35 +00:00
Nick O'Leary
e5ff25b92d
Fix project pull with authentication
2017-11-23 20:52:15 +00:00
Nick O'Leary
5c88888e02
Better auth handling in projects
2017-11-23 00:27:13 +00:00
Nick O'Leary
10057de9b3
A big projects update
...
Includes:
- change local/remote branches
- basic support for username/password handling
2017-11-21 23:31:41 +00:00
Jim Turner
6baedf909d
Fix #1478 - Project files are not being flushed to disk after being written ( #1479 )
...
* Call fsync() before closing file
* Fix race condition in tests due to incorrect stub.
The startFlows() function wasn't really being stubbed, so it was still being called. But there was no corresponding call to stopFlows().
In later tests, the check in Flows.init() was throwing the "Cannot init without a stop" error.
* Test coverage for fsync() calls
For issue #1478
* Revert "Fix race condition in tests due to incorrect stub."
This reverts commit 4f71d7851b
2017-11-17 17:29:33 +00:00
Nick O'Leary
57533fd831
Add commit-diff view
2017-10-25 15:26:24 +01:00
Nick O'Leary
3d6468326a
Allow a project's flow file to be changed
2017-10-19 21:38:53 +01:00
Nick O'Leary
5218a3fbac
Add custom project.toJSON to simplify state mangement
2017-10-17 10:14:50 +01:00
Nick O'Leary
4569cb432d
Add Project object in runtime
2017-10-16 23:23:50 +01:00
