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.

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

new navbar #6508

Merged
merged 67 commits into from
Nov 21, 2019
Merged

new navbar #6508

merged 67 commits into from
Nov 21, 2019

Commits on Oct 21, 2019

  1. Configuration menu
    Copy the full SHA
    bb19474 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2019

  1. Changed the hyperlink text in Login/Signup Model (publiclab#6364)

    * Changed the hyperlink text in Login/Signup Model
    
    Issue Number publiclab#6360
    
    * Updated Hyperlink Text
    
    * Updated Text in HyperLink
    amilaneni99 authored and jywarren committed Oct 25, 2019
    Configuration menu
    Copy the full SHA
    50164b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2019

  1. Update _nodes.html.erb

    jywarren authored Oct 28, 2019
    Configuration menu
    Copy the full SHA
    6d4c448 View commit details
    Browse the repository at this point in the history
  2. Functional Tests for Ordering aphabetically (publiclab#6371)

    * test ordering of tags
    
    * test that wikis are ordered alphabetically based on title
    
    * Fix failing test on wiki test
    StlMaris123 authored and jywarren committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    0c55eae View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cc9d89a View commit details
    Browse the repository at this point in the history
  4. OpenGraph for Twitter

    jywarren authored Oct 28, 2019
    Configuration menu
    Copy the full SHA
    3dad8ad View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. Configuration menu
    Copy the full SHA
    bfe7090 View commit details
    Browse the repository at this point in the history
  2. Add questions and comments to profile cards (publiclab#6472)

    * add # notes, questions, comments to user profile
    
    * fix codeclimate errors
    
    * display correct node type at top of tag/author page
    
    * fix /profile/comments/ to show by username
    
    * add route for comments by tagname, link added in profile
    
    * add styling to profile page cards
    
    * refactored Node.find_by_tag_and_author to use Node.questions
    
    * change display of note/question/comment links
    
    * add unit test for Comment.find_by_tag_and_author
    
    * add unit test for Node.find_by_tag_and_author
    
    * add assert for questions type in test find by name and user id
    
    * remove light grey footer background
    nstjean authored and jywarren committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    b8f1ada View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dfc153d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. Configuration menu
    Copy the full SHA
    93cbf54 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    053bd05 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    85e120f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f78fa2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    04a8ffd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4d6bcd4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    220278b View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. Flow: Button to post marker + Popup working for multiple maps (public…

    …lab#6591)
    
    * init
    
    * LEL pointed to different branch
    
    * popups working
    
    * removed forked leaflet
    
    * button working great
    
    * CSS changes of button
    
    * CSS changed to orignal bootstrap button
    sagarpreet-chadha authored and jywarren committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    3066fea View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2019

  1. Configuration menu
    Copy the full SHA
    35d077c View commit details
    Browse the repository at this point in the history
  2. Update README.md file (publiclab#6510)

    Added link to first-timers-only issue template.
    IvetaHron authored and cesswairimu committed Nov 2, 2019
    Configuration menu
    Copy the full SHA
    64bd591 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0eda8f7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9027525 View commit details
    Browse the repository at this point in the history
  5. Bump chart.js from 2.8.0 to 2.9.1 (publiclab#6567)

    Bumps [chart.js](https://github.com/chartjs/Chart.js) from 2.8.0 to 2.9.1.
    - [Release notes](https://github.com/chartjs/Chart.js/releases)
    - [Commits](chartjs/Chart.js@v2.8.0...v2.9.1)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
    dependabot-preview[bot] authored and jywarren committed Nov 2, 2019
    Configuration menu
    Copy the full SHA
    b0601f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2019

  1. Changed from function t to translation (publiclab#6609)

    Issue resolved: Change function t to translation in dashboard/_node_comment publiclab#6600
    ajitsinghkaler authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    cd49bd4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c650984 View commit details
    Browse the repository at this point in the history
  3. Update _comments.html.erb (publiclab#6585)

    I changed the function named t(....) to be named as translations(...).
    loranazarenko authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    59e4929 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4751a7f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d420a77 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3c6face View commit details
    Browse the repository at this point in the history
  7. wiki/methods: Change t to translation in (publiclab#6564)

    Changes the function name from t to translation in wiki/methods
    
    Fixes publiclab#6540
    mahoyen authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    3d2f76c View commit details
    Browse the repository at this point in the history
  8. t(....) named as translations(...) on lines 25, 30, 35 and 38 (public…

    …lab#6552)
    
    * t(....) named as translations(...) on lines 25, 30, 35 and 38
    
    * fix type translations to translation
    
    * Change function t to translations in comments/_edit
    
    * Revert "Change function t to translations in comments/_edit"
    
    This reverts commit e858b75.
    Ricardo Santos authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    a4ac9f4 View commit details
    Browse the repository at this point in the history
  9. changed t function name (publiclab#6546)

    * changed t function name
    
    * name fix
    KornelCygan authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    841865a View commit details
    Browse the repository at this point in the history
  10. change funcion t to translations in users/spamaway (publiclab#6545)

    * change funcion t to translations in users/spamaway
    
    * fix typo
    WojciechPreficz authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    21e282c View commit details
    Browse the repository at this point in the history
  11. Change function t to translations in comments/comments publiclab#6538 (

    …publiclab#6543)
    
    * Change function t to translations
    
    Change function t to translations in comments/comments
    
    * Change translations to translation
    mehnazyunus authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    033ae27 View commit details
    Browse the repository at this point in the history
  12. Update _node_meta.html.erb (publiclab#6606)

    Changing method "t" to "translation"
    MarieSell authored and SidharthBansal committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    f42c4b0 View commit details
    Browse the repository at this point in the history
  13. Fix follow button bug on tags (publiclab#6576)

    * Fix bug on issue publiclab#6570
    
    * Persist data
    crisner authored and cesswairimu committed Nov 3, 2019
    Configuration menu
    Copy the full SHA
    8128a30 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2019

  1. Add co-authored posts to profile.html.erb (publiclab#6418)

    * Add co-authored posts to profile.html.erb
    
    * Update profile.html.erb
    WulfPlasma authored and cesswairimu committed Nov 5, 2019
    Configuration menu
    Copy the full SHA
    5afa590 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a60fc81 View commit details
    Browse the repository at this point in the history
  3. Update stats.html.erb

    jywarren authored Nov 5, 2019
    Configuration menu
    Copy the full SHA
    e3f1150 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Change function to to translation publiclab#6603 (publiclab#6659)

    Change function t to translation in dashboard/_node_question publiclab#6603
    publiclab#6603
    klaffert authored and SidharthBansal committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    617f38a View commit details
    Browse the repository at this point in the history
  2. Refresh button (publiclab#6507)

    * added tooltip for refresh button
    
    * changes
    
    * new changes1
    vaibhavmathur13 authored and SidharthBansal committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    edb4bc0 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. publiclab#6539 Updated t to translations. (publiclab#6544)

    * Updated t to translations.
    
    * Updated translations to translation.
    
    Error in issue description.
    marcin-wicha authored and SidharthBansal committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    a720e67 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2019

  1. Configuration menu
    Copy the full SHA
    749f81b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b91eee View commit details
    Browse the repository at this point in the history
  3. Add more tests for Node (for note and wiki page titles) (publiclab#6366)

    * Add more tests for Node
    
    * Prevent titles that are empty, blank or too short
    
    * Update functional tests
    seabl authored and cesswairimu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    d8d0a54 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    517e624 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    803f93a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    161f007 View commit details
    Browse the repository at this point in the history
  7. Make "choose one" link in comment forms appear underlined (publiclab#…

    …6401)
    
    * Underline "choose one" link
    
    Make "choose one" link in comment forms appear underlined publiclab#6399
    
    * Add a CSS class to underline text
    
    * Add !important to underline CSS class
    crtlf authored and cesswairimu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    defce80 View commit details
    Browse the repository at this point in the history
  8. Fix rubocop errors in app/api & app/channels (publiclab#6425)

    * Fix rubocop errors in app/api & app/channels
    
    * Fix rubocop guardclause offenses
    yamiacat authored and cesswairimu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    431b557 View commit details
    Browse the repository at this point in the history
  9. Add tag link to show question (publiclab#6430)

    * simple fix for link
    
    * not sure what that file was
    dare892 authored and cesswairimu committed Nov 8, 2019
    Configuration menu
    Copy the full SHA
    26465cf View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2019

  1. Configuration menu
    Copy the full SHA
    adea102 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c7d8fe5 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2019

  1. Configuration menu
    Copy the full SHA
    77ae5f4 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Bump rake from 12.3.3 to 13.0.1 (publiclab#6764)

    Bumps [rake](https://github.com/ruby/rake) from 12.3.3 to 13.0.1.
    - [Release notes](https://github.com/ruby/rake/releases)
    - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc)
    - [Commits](ruby/rake@v12.3.3...v13.0.1)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
    dependabot-preview[bot] authored and jywarren committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    36840be View commit details
    Browse the repository at this point in the history
  2. Update _comments.html.erb (publiclab#6766)

    * Update _comments.html.erb
    
    Changed the t() to translation() in line 4, 18 and 21.
    
    * Update _comments.html.erb
    
    Changed the two translation() back to t() on line 18.
    Thunder80 authored and SidharthBansal committed Nov 12, 2019
    Configuration menu
    Copy the full SHA
    50b355a View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. Full screen button added in inline maps, Multiple maps in Wiki page w…

    …orks now. (publiclab#6699)
    
    * full screen added
    
    * working on wiki page
    
    * code refactoring
    
    * console logs removed
    
    * inline map layers are ON by default now
    
    * version bump of LEL to add new Layers
    
    * api changed tagslocation init
    
    * api taglocations changed
    
    * popup content changed
    sagarpreet-chadha authored and jywarren committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    268352c View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2019

  1. PL.editor shows map if lat,lon passed in URL. (publiclab#6788)

    * pl-editor shows map
    
    * indentation
    
    * yarn.lock added for PL.editor
    
    * safe traverse syntax used
    sagarpreet-chadha authored and jywarren committed Nov 17, 2019
    Configuration menu
    Copy the full SHA
    6aad743 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. map API using common global variable. (publiclab#6802)

    * done
    
    * removed console logs
    sagarpreet-chadha authored and jywarren committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    35e9767 View commit details
    Browse the repository at this point in the history
  2. [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4 (publiclab#6803)

    Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.**
    - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases)
    - [Commits](TooTallNate/proxy-agents@2.2.1...2.2.4)
    
    Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
    dependabot-preview[bot] authored and jywarren committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    a5d3392 View commit details
    Browse the repository at this point in the history
  3. Update _thumbnail.html.erb to make it consistent with new card display (

    publiclab#6581)
    
    * Update _thumbnail.html.erb
    
    * Update style.css
    
    * Update node_shared_test.rb
    
    * Update _thumbnail.html.erb
    
    * Update _notes.html.erb
    
    * Update _notes.html.erb
    
    * Update _notes.html.erb
    
    * added ApplicationController.helpers.logged_in_as
    
    * Update _notes.html.erb
    
    * self.current_user in application_helper.rb
    
    * Update application_helper.rb
    
    * switch to "@current_user && ['admin','moderator'].includes?(@current_user.role)"
    
    * PL.editor shows map if lat,lon passed in URL. (publiclab#6788)
    
    * pl-editor shows map
    
    * indentation
    
    * yarn.lock added for PL.editor
    
    * safe traverse syntax used
    
    * handle nils
    
    * Update _notes.html.erb
    jywarren authored Nov 18, 2019
    Configuration menu
    Copy the full SHA
    1e0eba7 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. Configuration menu
    Copy the full SHA
    a775cb5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0071096 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2019

  1. final navbar

    jywarren committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    fb2d358 View commit details
    Browse the repository at this point in the history
  2. merge

    jywarren committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    4d676d4 View commit details
    Browse the repository at this point in the history
  3. fixes for collapse menu

    jywarren committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    8dbdc85 View commit details
    Browse the repository at this point in the history
  4. fixes for collapse menu 2

    jywarren committed Nov 20, 2019
    Configuration menu
    Copy the full SHA
    5087421 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. rest of menus

    jywarren committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    225ac6c View commit details
    Browse the repository at this point in the history