Mo Bitar
97ef57ea27
Conflict resolution window
2018-09-06 21:47:48 -05:00
Mo Bitar
fbf4458699
Merge branch 'master' of github.com:standardnotes/web
2018-09-06 10:57:53 -05:00
Mo Bitar
573009cc82
frame-src allow data: url
2018-09-06 10:57:47 -05:00
Mo Bitar
8035476350
Merge pull request #236 from oldjamey/docker/prod-config
...
Update Dockerfile for optional production use
2018-09-06 07:58:42 -05:00
oldjamey
a010c3e503
Update Dockerfile for optional production use
...
Added commented-out portions of Dockerfile that can be uncommented for use in production. Additional instruction was supplied in Dockerfile comments to change parameter in config/environments/production.rb for standard Docker best practices production configuration.
2018-09-05 09:44:58 -05:00
Mo Bitar
f23b3fc901
Merge pull request #234 from oldjamey/hotfix/docker-restart
...
Fix Docker restart issue
2018-09-05 09:13:16 -05:00
oldjamey
a880f6541e
Fix Docker restart issue
...
added line in docker/entrypoint that enables clean restarting of the application without causing a boot loop
2018-09-04 15:01:23 -07:00
Mo Bitar
1e6aeebb4b
v2.3.8
2018-09-04 09:32:25 -05:00
Mo Bitar
65176d0e87
Merge branch 'master' of github.com:standardnotes/web
2018-09-03 18:56:57 -05:00
Mo Bitar
c11fc7ce75
Do note check when hiding a component, SFJS 0.3.14
2018-09-03 18:56:51 -05:00
Mo Bitar
05583bea75
Merge pull request #232 from oldjamey/security-fix/karma-version
...
Security fix/karma version
2018-09-03 09:19:32 -05:00
Mo Bitar
8e6c084ca9
Merge pull request #230 from oldjamey/hotfix/dockerfile-update
...
Update Dockerfile Comments
2018-09-03 09:15:26 -05:00
oldjamey
5e42087c7c
Update Karma Version to resolve high security issues.
...
This needs to be checked thoroughly before being merged. I have tested on localhost, and everything seems to work fine, but this was able to resolve 2 high vulnerabilities caused by Karma dependencies.
2018-09-03 00:40:47 -07:00
oldjamey
353ce67048
Security fix for ws dependency.
...
This needs to be tested thoroughly before merging. This seems to have gotten rid of 3 high security vulnerabilities by upgrading the ws dependency that karma uses. Please spot check this before committing to master branch.
2018-09-03 00:24:50 -07:00
oldjamey
36240bd0aa
Update Dockerfile Comments
...
The "run" instructions had a different image name from the "build" instructions. This update just makes them work correctly together.
2018-09-02 21:45:56 -07:00
Mo Bitar
347ee8ddd7
Merge branch 'master' of github.com:standardnotes/web
2018-09-02 10:05:53 -05:00
Mo Bitar
0ea37ba7bb
Fixes issue where component view would listen to all component events instead own event
2018-09-02 10:05:23 -05:00
Mo Bitar
cc9c23fec9
Merge pull request #229 from oldjamey/hotfix/dockerfile-update
...
Update Dockerfile
2018-09-01 08:57:36 -05:00
oldjamey
e0a2566e3a
Updated Dockerfile
...
Also added instructions for building and deploying Docker image, and added docker directory with custom entrypoint
2018-08-31 14:45:37 -05:00
Mo Bitar
a94ae8dead
safeTitle access for note.title.replace
2018-08-19 15:42:04 -05:00
Mo Bitar
f7df71a52e
npnignore file
2018-08-19 15:37:32 -05:00
Mo Bitar
7076088391
v2.3.5
2018-08-19 15:30:47 -05:00
Mo Bitar
4eec7e3395
Increase scrollbar width by a few px
2018-08-19 10:35:30 -05:00
Mo Bitar
e9b7b0ae36
Double click on actual resizer rather than panel
2018-08-19 10:31:58 -05:00
Mo Bitar
69c82bc362
Component manager do not save locked items
2018-08-17 09:57:22 -05:00
Mo Bitar
9926f90697
Option to toggle editor margin resizers, disabled by default
2018-08-16 09:48:48 -05:00
Mo Bitar
71f4f9aba1
Refactor menu-row ng-click into action property
2018-08-16 09:40:32 -05:00
Mo Bitar
946ed40623
Double click panel resizer to toggle collapse
2018-08-16 09:15:00 -05:00
Mo Bitar
7513f5dfb3
Resizable panels fix collapsed opacity issue
2018-08-16 08:54:11 -05:00
Mo Bitar
941ec426da
Update batch manager
2018-08-15 11:54:58 -05:00
Mo Bitar
8a46bd0f29
Components manager delete items reply
2018-08-15 11:53:33 -05:00
Mo Bitar
75ff1c89cd
Catch up version
2018-08-15 10:29:26 -05:00
Mo Bitar
1ca6fdd3fb
Merge branch 'master' of github.com:standardnotes/web
2018-08-15 10:28:20 -05:00
Mo Bitar
75fe790f6c
SFJS 0.3.12
2018-08-15 10:28:15 -05:00
Mo Bitar
d62f57d3e0
Merge pull request #223 from DeveloperDavo/master
...
Run app locally without having to know about grunt
2018-08-14 11:21:47 -05:00
Mo Bitar
8098e2af25
Disable auto-opening Account menu
2018-08-14 09:55:43 -05:00
Developer Davo
0d4a70aa14
Revert Changes to package-lock.json
2018-08-13 18:08:35 +02:00
Developer Davo
fbb2fa6bcb
Revert Grunt upgrade
2018-08-13 18:06:08 +02:00
Mo Bitar
4f7e6ec507
Fix auth manager constructor
2018-08-11 19:28:12 -05:00
Mo Bitar
2203ee9b5e
Refactor into publishable npm module
2018-08-11 19:05:31 -05:00
Developer Davo
9998d1e0ef
Run app locally without having to know about grunt
2018-08-08 20:43:46 +02:00
Mo Bitar
6cbff05e10
Scroll import password request into view
2018-08-05 09:54:59 -05:00
Mo Bitar
7551170262
Readme
2018-08-05 09:45:27 -05:00
Mo Bitar
c12644dcd3
Handle deleting legacy note/tag relationships
2018-08-05 09:36:26 -05:00
Mo Bitar
b4735c7b8e
Session history metadata change label
2018-07-25 08:46:27 -05:00
Mo Bitar
b67820b971
Dont update client date for migration
2018-07-23 16:58:40 -05:00
Mo Bitar
4ffb4c4ae7
SFJS 0.3.7, sync exception event
2018-07-23 08:59:44 -05:00
Mo Bitar
e4da258d46
Default auth params version value, SFJS 0.3.6
2018-07-23 08:48:22 -05:00
Mo Bitar
cd3d5891c1
Update SFJS 0.3.5
2018-07-22 19:35:31 -05:00
Mo Bitar
0abe43696b
Merge pull request #218 from standardnotes/flexible-content
...
Flexible content and session history
2018-07-22 18:57:31 -05:00
