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

Jump to bottom

added new commits #1

Merged
merged 76 commits into from
Jan 3, 2019
Merged

added new commits #1

merged 76 commits into from
Jan 3, 2019

Conversation

MargaretAN9
Copy link
Owner

Fixes #[Add issue number here.]

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

aashna27 and others added 30 commits November 11, 2018 12:51
@aashna27 @jywarren
brightness module's info.json modified (#461)
9e1a12c
@kevinzluo @jywarren
Alphabetizes the modules in src/Modules.js (#441)
1311119
@Divy123 @jywarren
Disabled save-sequence button when no steps are added (#462)
4576e49
@Mridul97 @jywarren
Add contrast module (#463)
4bdc5b6
@okonek @jywarren
Added a success message after a successfull sequence saving (#469)
d209cd4
@jywarren
Colormap fixes! (#475)
19110c4 
* updated colormap.js

* remove redundancy

* compile

* added maps to interface
@Rishabh570 @jywarren
Capitalize the Gif text on View Gif button. (#476)
ef10fb7
@harshkhandeparkar @jywarren
GCI task pull request (#474)
bf13d58 
* GCI task commit

* GCI task commit

* Cleaned up the code

* Added the css to demo.css file

* Final cleanup and shortened code

* Code compacting

* All beautify changes reverted

* Spacing corrected
@harshkhandeparkar @jywarren
Feature enter to save (#483)
20cf327 
* Flash Message bug fix

* enter-to-submit functionality added

* cleanup
@harshkhandeparkar @jywarren
Flash Message bug fix (#481)
cd6f61d
@bhavayAnand9 @jywarren
fixed few typos (#482)
3ca4081 
* fixed few typos

* fixed typos in docs

* suggested changes
@jywarren
Add manifest.json and cache static assets for offline use (#331) (#486)
98c71b1 
* Add manifest.json

* cache static assets for offline use

* update cache

* add meta theme-color and change static files to be cache

* cache the files on network request

* caching on first run

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>

* add a button to clear cache

* add styling to clear cache link
@jonxuxu @jywarren
display add step menu with common modules as "quick" buttons (#479)
f672dc8 
* added icons, rearranging

* basic framework for addstep modules

* linked buttons to automatic step addition

* Delete package-lock.json

* rounded buttons and text movement in image sequencer select

* made null option visible in select dropdown

* package-lock.json
@Mridul97 @jywarren
Skip writing defaults (#497)
3712f0c 
* skip writing defaults

* solve build errors
@okonek @jywarren
Added the sucessfull installation prompt (#485)
ddf4bd0
@ovipa017-xamk @jywarren
Change button text (#505)
5af30d9
@bhavayAnand9 @jywarren
align add-step button with select-module input (#501)
f152a78
@oorjitchowdhary @jywarren
Corrected brightness default view (#509)
108e879
@bhavayAnand9 @jywarren
slider now goes all the way to right & left (#510)
2161d58
@dependabot @jywarren
Bump tape-run from 3.0.4 to 4.0.0 (#520)
88a31e5 
Bumps [tape-run](https://github.com/juliangruber/tape-run) from 3.0.4 to 4.0.0.
- [Release notes](https://github.com/juliangruber/tape-run/releases)
- [Changelog](https://github.com/juliangruber/tape-run/blob/master/History.md)
- [Commits](tape-testing/tape-run@v3.0.4...v4.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump ora from 2.1.0 to 3.0.0 (#529)
ca67bf1 
Bumps [ora](https://github.com/sindresorhus/ora) from 2.1.0 to 3.0.0.
- [Release notes](https://github.com/sindresorhus/ora/releases)
- [Commits](sindresorhus/ora@v2.1.0...v3.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump image-filter-threshold from 1.0.0 to 2.0.1 (#521)
c688817 
Bumps [image-filter-threshold](https://github.com/canastro/image-filter-threshold) from 1.0.0 to 2.0.1.
- [Release notes](https://github.com/canastro/image-filter-threshold/releases)
- [Commits](https://github.com/canastro/image-filter-threshold/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump grunt-contrib-concat from 0.5.1 to 1.0.1 (#522)
65a6b77 
Bumps [grunt-contrib-concat](https://github.com/gruntjs/grunt-contrib-concat) from 0.5.1 to 1.0.1.
- [Release notes](https://github.com/gruntjs/grunt-contrib-concat/releases)
- [Changelog](https://github.com/gruntjs/grunt-contrib-concat/blob/master/CHANGELOG)
- [Commits](gruntjs/grunt-contrib-concat@v0.5.1...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump image-filter-core from 1.0.0 to 2.0.2 (#528)
6a2f106 
Bumps [image-filter-core](https://github.com/canastro/image-filter-core) from 1.0.0 to 2.0.2.
- [Release notes](https://github.com/canastro/image-filter-core/releases)
- [Commits](https://github.com/canastro/image-filter-core/commits/2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump font-awesome from 4.5.0 to 4.7.0 (#527)
6d381c0 
Bumps [font-awesome](https://github.com/FortAwesome/Font-Awesome) from 4.5.0 to 4.7.0.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@v4.5.0...v4.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump looks-same from 3.3.0 to 4.1.0 (#531)
c81f5c6 
Bumps [looks-same](https://github.com/gemini-testing/looks-same) from 3.3.0 to 4.1.0.
- [Release notes](https://github.com/gemini-testing/looks-same/releases)
- [Changelog](https://github.com/gemini-testing/looks-same/blob/master/CHANGELOG.md)
- [Commits](gemini-testing/looks-same@v3.3.0...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump bootstrap from 3.2.0 to 3.3.7 (#523)
7ae8a2d 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.2.0 to 3.3.7.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](twbs/bootstrap@v3.2.0...v3.3.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@dependabot @jywarren
Bump browserify from 13.0.0 to 16.2.3 (#533)
a26a441 
Bumps [browserify](https://github.com/browserify/browserify) from 13.0.0 to 16.2.3.
- [Release notes](https://github.com/browserify/browserify/releases)
- [Changelog](https://github.com/browserify/browserify/blob/master/changelog.markdown)
- [Commits](browserify/browserify@13.0.0...v16.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
@momomen @jywarren
Update README.md (#525)
753e73f 
Updated the command for installing dependencies for Unix based platform to:
`sudo npm run setup` instead of  `sudo npm setup` as requested in issues.
@pomyo @jywarren
Update defaultHtmlStepUi.js (#517)
1ae20b5
divy123 and others added 29 commits December 17, 2018 16:02
Add step butoon disabled for last step
6bab70a
@tech4GT
Merge pull request #545 from Divy123/add-step-btn
23f4851 
Added insert step button at every step
@aashna27
TakePhoto functionality added
59898d7
@tech4GT
fix bug preventing insert-step
eebf149 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
@tech4GT
Merge pull request #551 from tech4GT/fixInsertStep
980966e 
fix bug preventing insert-step
@tech4GT
Merge branch 'main' of https://github.com/publiclab/image-sequencer i…
7cd89c4 
…nto local
@tech4GT
update dist files
8a96bd8 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
@tech4GT
Merge pull request #549 from aashna27/Take-Photo-functionality
3e5cec3 
TakePhoto functionality added
@tech4GT
Merge pull request #548 from publiclab/dependabot/npm_and_yarn/tape-r…
e2f1fb9 
…un-5.0.0

Bump tape-run from 4.0.0 to 5.0.0
@tech4GT
update dist files
300d972 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
@tech4GT
Merge pull request #552 from tech4GT/dependencies
9fedf4b 
Update dist files
@tech4GT
fix contributing.md
056e57a 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
@tech4GT
Merge pull request #553 from tech4GT/deadLink
94e4dfe 
fix contributing.md
rearrange buttons
ac9086e
btn-fix
d49acd5
cleanup
5288973
Added documentation for all modules in Modules.md and added a link in…
35b95a6 
… info.json of each Module
Added index to MODULES.md
ee5a3a5
Corrected markdown format
d7b175e
Corrected markdown format-2
8ff09e2
@tech4GT
Merge pull request #554 from HarshKhandeparkar/btn-rearrange
d5aac98 
Rearrange Sequence Buttons
@Divy123
Fixed a typo.
3ab0212
Merge remote-tracking branch 'upstream/main' into docs-improve
3a39d2b
Added dist file changes
7f4f9a0
@tech4GT
Merge pull request #555 from Divy123/docs-improve
901cf6a 
Added documentation for all remaining modules
@tech4GT
update dist
f3291e2 
Signed-off-by: tech4GT <varun.gupta1798@gmail.com>
@tech4GT
Merge pull request #560 from tech4GT/updateDist2
f77cfac 
update dist
@harshkhandeparkar @tech4GT
Fixed Gif Generation (#561)
611016b 
* update dist

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>

dist update

Revert "dist update"

This reverts commit 9ee2a98.

* Fix Gif
@vibhorgupta-gh @jywarren
updating description text to default (#574)
39c70d1
@MargaretAN9 MargaretAN9 merged commit 1d6fd81 into MargaretAN9:main Jan 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.