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

Misc updates #1970

Open
wants to merge 537 commits into
base: beta
Choose a base branch
from
Open

Misc updates #1970

wants to merge 537 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Apr 6, 2018

  1. add_asset changes reverted back

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    1d39621 View commit details
    Browse the repository at this point in the history

  2. add_asset template changes reverted

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    61f6467 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2018

  1. search and adv seach commented in _init.py

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    c52d5bf View commit details
    Browse the repository at this point in the history

  2. Search button fixed on right nav

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    2ae8a78 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2018

  1. Merge pull request gnowledge#2 from tirthakarmahesh211/beta-release11 

    Add_asset changes reverted
    @siddhudhangar
    siddhudhangar authored Apr 8, 2018
    Configuration menu
    Copy the full SHA
    1a4227d View commit details
    Browse the repository at this point in the history

  2. created some custom ndf_tags to convert 13 digit number to date

    @siddhudhangar
    siddhudhangar committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    96403ba View commit details
    Browse the repository at this point in the history

  3. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    16860b6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'es-gstudio-api' into beta-release11

    @siddhudhangar
    siddhudhangar authored Apr 8, 2018
    Configuration menu
    Copy the full SHA
    87c9abe View commit details
    Browse the repository at this point in the history

  5. Merge pull request gnowledge#4 from tirthakarmahesh211/beta-release11 

    Search button fixed on right nav
    @siddhudhangar
    siddhudhangar authored Apr 8, 2018
    Configuration menu
    Copy the full SHA
    3a66c6b View commit details
    Browse the repository at this point in the history

  6. for hindi ... some changes in main_simple_card.html....

    @siddhudhangar
    siddhudhangar committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    822fa94 View commit details
    Browse the repository at this point in the history

  7. In Lang menu white space removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    ba5205f View commit details
    Browse the repository at this point in the history

  8. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    cd49ec1 View commit details
    Browse the repository at this point in the history

  9. Oauth code for login

    amitmoralwar committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    0cc88cf View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. my desk z key removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    954cb52 View commit details
    Browse the repository at this point in the history

  2. my desk text in hindi set properly

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    39abf71 View commit details
    Browse the repository at this point in the history

  3. for advanced_search ..... teaches query modified

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    1a3a461 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21… 

    …1/gstudio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    b44599d View commit details
    Browse the repository at this point in the history

  5. partner view ... added code for hindi text

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    0fcb057 View commit details
    Browse the repository at this point in the history

  6. partner view ... added code for hindi text

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    50c7cc9 View commit details
    Browse the repository at this point in the history

  7. repository.html and main_simple_card.html file changed for hindi text… 

    … ...
    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    f78a817 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21… 

    …1/gstudio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    d683191 View commit details
    Browse the repository at this point in the history

  9. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    dc3b8b9 View commit details
    Browse the repository at this point in the history

  10. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    18d2647 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    5a89a50 View commit details
    Browse the repository at this point in the history

  12. Fixes in oauth module

    amitmoralwar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    0a10508 View commit details
    Browse the repository at this point in the history

  13. my-progeunwanted space removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    83b09a4 View commit details
    Browse the repository at this point in the history

  14. about us blog background color changed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    de7ce2e View commit details
    Browse the repository at this point in the history

  15. Login using mastodon oauth

    amitmoralwar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    4389e24 View commit details
    Browse the repository at this point in the history

  16. Merge pull request gnowledge#5 from tirthakarmahesh211/beta-release11 

    Language Hindi White space removed
    @siddhudhangar
    siddhudhangar authored Apr 9, 2018
    Configuration menu
    Copy the full SHA
    186f92d View commit details
    Browse the repository at this point in the history

  17. gbase_wrap min-height commented

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    a53fbfd View commit details
    Browse the repository at this point in the history

  18. Modify 2 files for code merging by removing unwanted code

    amitmoralwar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    66e6086 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'es-gstudio-api' into card-list

    @siddhudhangar
    siddhudhangar authored Apr 9, 2018
    Configuration menu
    Copy the full SHA
    c1f9909 View commit details
    Browse the repository at this point in the history

  20. Merge pull request gnowledge#6 from amitmoralwar/card-list 

    Login with mastodon
    @siddhudhangar
    siddhudhangar authored Apr 9, 2018
    Configuration menu
    Copy the full SHA
    ada5227 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    57c4a0b View commit details
    Browse the repository at this point in the history

  22. add asset form validation fixed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    09d904d View commit details
    Browse the repository at this point in the history

  23. Merge pull request gnowledge#7 from tirthakarmahesh211/beta-release11 

    Form Validation for  add asset is fixed
    @siddhudhangar
    siddhudhangar authored Apr 9, 2018
    Configuration menu
    Copy the full SHA
    166dcfd View commit details
    Browse the repository at this point in the history

  24. changed version of mastodon in requirement.txt

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    ac7932a View commit details
    Browse the repository at this point in the history

  25. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    3400887 View commit details
    Browse the repository at this point in the history

  26. deleted mastodon two files

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    1b4e4b8 View commit details
    Browse the repository at this point in the history

  27. node.py and filehive.py file modified.... import statement removed

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    efaefa1 View commit details
    Browse the repository at this point in the history

  28. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    ad004f1 View commit details
    Browse the repository at this point in the history

  29. header_clix elasticsearch code commented

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    8efc842 View commit details
    Browse the repository at this point in the history

  30. sform.html commented and jquery=3.1.1 removed

    @siddhudhangar
    siddhudhangar committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    9b99ff8 View commit details
    Browse the repository at this point in the history

  31. changes reverted back - course_pages course_about div removed gbase c… 

    …ss removed
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    c5f32e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-release
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    03b71de View commit details
    Browse the repository at this point in the history

  2. eCourses card linked to explore_courses

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    c3f5ff6 View commit details
    Browse the repository at this point in the history

  3. ImageDashboard.html and ImageDashboard.py views changed ... added sel… 

    …ect box and search box for searching resources
    @siddhudhangar
    siddhudhangar committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    9003571 View commit details
    Browse the repository at this point in the history

  4. File modified in login with mastodon

    amitmoralwar committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    c18104f View commit details
    Browse the repository at this point in the history

  5. Login with mastodon file modified

    amitmoralwar committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    c4514a1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request gnowledge#8 from tirthakarmahesh211/beta-release11 

    Changes reverted back
    @siddhudhangar
    siddhudhangar authored Apr 10, 2018
    Configuration menu
    Copy the full SHA
    2bc191c View commit details
    Browse the repository at this point in the history

  7. Merge pull request gnowledge#9 from amitmoralwar/card-list 

    File Modified of mastodon login
    @siddhudhangar
    siddhudhangar authored Apr 10, 2018
    Configuration menu
    Copy the full SHA
    52ab592 View commit details
    Browse the repository at this point in the history

  8. New images added for slider and in login css fixed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    6699677 View commit details
    Browse the repository at this point in the history

  9. slider images added

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    54eccdc View commit details
    Browse the repository at this point in the history

  10. In create page required field alert is fixed properly

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    5abe410 View commit details
    Browse the repository at this point in the history

  11. In e-library ... removed file value in member_of attribute... for sho… 

    …wing pages and images
    @siddhudhangar
    siddhudhangar committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    d6a6a8b View commit details
    Browse the repository at this point in the history

  12. Total nos of discussion added on landing page

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    75544f4 View commit details
    Browse the repository at this point in the history

  13. old slider images removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    39d8e35 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2018

  1. Merge branch 'es-gstudio-api' into beta-release11

    @siddhudhangar
    siddhudhangar authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    337bf73 View commit details
    Browse the repository at this point in the history

  2. Merge pull request gnowledge#10 from tirthakarmahesh211/beta-release11 

    Landing Page slider images updated and Login page css fixed
    @siddhudhangar
    siddhudhangar authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    e2d5dee View commit details
    Browse the repository at this point in the history

  3. e-library query modified for pages

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    d33689d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    5b99a32 View commit details
    Browse the repository at this point in the history

  5. on partners cards striptags added

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    4216492 View commit details
    Browse the repository at this point in the history

  6. e-library pages showed properly

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    3f33828 View commit details
    Browse the repository at this point in the history

  7. issue resolved

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    31765f5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21… 

    …1/gstudio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    77d0864 View commit details
    Browse the repository at this point in the history

  9. Merge pull request gnowledge#11 from tirthakarmahesh211/beta-release11 

     on partners cards striptags added
    @siddhudhangar
    siddhudhangar authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    057b88c View commit details
    Browse the repository at this point in the history

  10. remove pages option from e-library

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    e9fb3c7 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    2328050 View commit details
    Browse the repository at this point in the history

  12. removed pages option from e-librayr

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    0000adb View commit details
    Browse the repository at this point in the history

  13. who we are blog removed and also watermark logo fixed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    72689e4 View commit details
    Browse the repository at this point in the history

  14. analytics blog size reduced

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    6874da2 View commit details
    Browse the repository at this point in the history

  15. Merge pull request gnowledge#12 from tirthakarmahesh211/beta-release11 

    About us blog removed and watermark image fixed
    @siddhudhangar
    siddhudhangar authored Apr 11, 2018
    Configuration menu
    Copy the full SHA
    5b1bbe4 View commit details
    Browse the repository at this point in the history

  16. event and partner issue resolved

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    4c24a07 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    669400b View commit details
    Browse the repository at this point in the history

  18. some minor issue fixed

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    f8f6491 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'beta' of https://github.com/gnowledge/gstudio into card… 

    …-list
    amitmoralwar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    e157b34 View commit details
    Browse the repository at this point in the history

  20. gnowledge:beta branch with siddhudhangar:es-gstudio-api

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    825b16e View commit details
    Browse the repository at this point in the history

  21. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    5651470 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into card-list
    amitmoralwar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    13f673a View commit details
    Browse the repository at this point in the history

  23. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-release
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    18b07f2 View commit details
    Browse the repository at this point in the history

  24. misc issue resolved

    @siddhudhangar
    siddhudhangar committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    e16b6ed View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. files and pages both resources displayed on e-library

    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    bfd2fc7 View commit details
    Browse the repository at this point in the history

  2. added two variable in setting file .... GSTUDIO_ELASTIC_SEARCH_IN_NOD… 

    …E_CLASS , GSTUDIO_ELASTIC_SEARCH_IN_FILEHIVE_CLASS
    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    d99919b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into card-list
    amitmoralwar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    69bbd7b View commit details
    Browse the repository at this point in the history

  4. misc changes ..

    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    1 Configuration menu
    Copy the full SHA
    c06a547 View commit details
    Browse the repository at this point in the history

  5. local and global search option removed from search bar

    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    376a044 View commit details
    Browse the repository at this point in the history

  6. Topic map and calendar removed from complete site

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    afc5c77 View commit details
    Browse the repository at this point in the history

  7. calendar and topic map commented from lms_sec_header

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    ca4cbcb View commit details
    Browse the repository at this point in the history

  8. In ndf_tags, get_sg_member_of method,we added if conditon to check no… 

    …netype for group_obj
    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    a4edff5 View commit details
    Browse the repository at this point in the history

  9. removed extra spaces

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    e992226 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'es-gstudio-api' into beta-release11

    @siddhudhangar
    siddhudhangar authored Apr 12, 2018
    Configuration menu
    Copy the full SHA
    9cc7a8a View commit details
    Browse the repository at this point in the history

  11. Merge pull request gnowledge#13 from tirthakarmahesh211/beta-release11 

    Topic map and Calendar removed from lms_secondary_header
    @siddhudhangar
    siddhudhangar authored Apr 12, 2018
    Configuration menu
    Copy the full SHA
    4cc26a2 View commit details
    Browse the repository at this point in the history

  12. dev/template/ url added

    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    c0e148c View commit details
    Browse the repository at this point in the history

  13. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    7ce791f View commit details
    Browse the repository at this point in the history

  14. new images added and homogenous word added in poa

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    1d5b7a3 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21… 

    …1/gstudio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    cdbbaf6 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-release
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    8b433c7 View commit details
    Browse the repository at this point in the history

  17. search box fixed on right

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    25e3e62 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2018

  1. footer trans tag issue resolved

    @siddhudhangar
    siddhudhangar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    cb1b303 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into card-list
    amitmoralwar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    aaf0e26 View commit details
    Browse the repository at this point in the history

  3. search box moved to right after click...

    @siddhudhangar
    siddhudhangar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    4c44cba View commit details
    Browse the repository at this point in the history

  4. Interaction setting-discuss in top right has same UI as discuss in bo… 

    …ttom
    amitmoralwar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    b71931f View commit details
    Browse the repository at this point in the history

  5. search box fixed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    e268a3c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    90056d3 View commit details
    Browse the repository at this point in the history

  7. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    d6d49b5 View commit details
    Browse the repository at this point in the history

  8. eResourses and discussion added in po

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    746d371 View commit details
    Browse the repository at this point in the history

  9. Merge pull request gnowledge#14 from amitmoralwar/card-list 

    Interaction Setting
    @siddhudhangar
    siddhudhangar authored Apr 13, 2018
    Configuration menu
    Copy the full SHA
    93ae902 View commit details
    Browse the repository at this point in the history

  10. search box code reomved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    e66ba19 View commit details
    Browse the repository at this point in the history

  11. Merge pull request gnowledge#15 from tirthakarmahesh211/beta-release11 

    search box fixed on Header at left side
    @siddhudhangar
    siddhudhangar authored Apr 13, 2018
    Configuration menu
    Copy the full SHA
    39a49a0 View commit details
    Browse the repository at this point in the history

  12. search box moved to right after click...

    @siddhudhangar
    siddhudhangar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    c882f21 View commit details
    Browse the repository at this point in the history

  13. merge branch beta-release11 with es-gstudio-api

    @siddhudhangar
    siddhudhangar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    52c6b16 View commit details
    Browse the repository at this point in the history

  14. all files option default now in e-library

    @siddhudhangar
    siddhudhangar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    f77877f View commit details
    Browse the repository at this point in the history

  15. only files showed ... pages removed from e-library except interactives

    @siddhudhangar
    siddhudhangar committed Apr 13, 2018
    Configuration menu
    Copy the full SHA
    c3f36bc View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2018

  1. In module view .. if not gstaff_access and module_obj.agency_type != … 

    …'Partner' conditon added for show partners
    @siddhudhangar
    siddhudhangar committed Apr 14, 2018
    Configuration menu
    Copy the full SHA
    660f8b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2018

  1. ebook.html and ebook.py .... some code modified for worked both ES an… 

    …d mongo
    @siddhudhangar
    siddhudhangar committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    33edc30 View commit details
    Browse the repository at this point in the history

  2. Update sync_existing_document to add access_token field for existing … 

    …auth objects
    amitmoralwar committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    f8779fb View commit details
    Browse the repository at this point in the history

  3. Update sync_existing_document to add access_token field for existing … 

    …auth objects
    amitmoralwar committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    1634f0e View commit details
    Browse the repository at this point in the history

  4. Merge pull request gnowledge#16 from amitmoralwar/card-list 

    Update sync_existing_document to add access_token field for existing …
    @siddhudhangar
    siddhudhangar authored Apr 15, 2018
    Configuration menu
    Copy the full SHA
    3d03d55 View commit details
    Browse the repository at this point in the history

  5. es_injection.py file modified

    @siddhudhangar
    siddhudhangar committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    085d191 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    7b5efdd View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2018

  1. removed get filter from ndf_tags file

    @siddhudhangar
    siddhudhangar committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    d678760 View commit details
    Browse the repository at this point in the history

  2. dev query url uncommented

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    8d264e5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    a4b5079 View commit details
    Browse the repository at this point in the history

  4. uncomment advanced_search url from urls/__init__.py

    @siddhudhangar
    siddhudhangar committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    9362460 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    a06b107 View commit details
    Browse the repository at this point in the history

  6. all audio images shown default images in e-library ... now issue reso… 

    …lved
    @siddhudhangar
    siddhudhangar committed Apr 16, 2018
    Configuration menu
    Copy the full SHA
    90122a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. In simple card, added if else conditon for mongo and ES

    @siddhudhangar
    siddhudhangar committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    469224f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/simple_card.html
    @siddhudhangar
    siddhudhangar committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    79ce38b View commit details
    Browse the repository at this point in the history

  3. oined button removed from Partner showcases cards and some trans are … 

    …added
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    e5abd2b View commit details
    Browse the repository at this point in the history

  4. create partner ,simple card code modified, enable advanced search

    @siddhudhangar
    siddhudhangar committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    6b89534 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2018

  1. old partners show old e-library ui.... new Partner show workspace ui

    @siddhudhangar
    siddhudhangar committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    06b1fef View commit details
    Browse the repository at this point in the history

  2. New trans added

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    8da6d79 View commit details
    Browse the repository at this point in the history

  3. write block from activity player is removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    74d2bc5 View commit details
    Browse the repository at this point in the history

  4. conflicts removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    bab06c9 View commit details
    Browse the repository at this point in the history

  5. video,audio,image downloaded along with filename in any language

    amitmoralwar committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    58a682e View commit details
    Browse the repository at this point in the history

  6. In search_views,exclude code for thumbnail and profile picture

    @siddhudhangar
    siddhudhangar committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    5e4ea36 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'es-gstudio-api' into beta-release11

    @siddhudhangar
    siddhudhangar authored Apr 18, 2018
    Configuration menu
    Copy the full SHA
    044d10a View commit details
    Browse the repository at this point in the history

  8. Merge pull request gnowledge#18 from tirthakarmahesh211/beta-release11 

    Beta release11
    @siddhudhangar
    siddhudhangar authored Apr 18, 2018
    Configuration menu
    Copy the full SHA
    f7c31ea View commit details
    Browse the repository at this point in the history

  9. Merge pull request gnowledge#17 from amitmoralwar/card-list 

    video,audio,image downloaded along with filename in any language
    @siddhudhangar
    siddhudhangar authored Apr 18, 2018
    Configuration menu
    Copy the full SHA
    af4369f View commit details
    Browse the repository at this point in the history

  10. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    0ffae4a View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2018

  1. Telugu lang option removed from lang dropdown

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    b5a82c6 View commit details
    Browse the repository at this point in the history

  2. Resource menu removed from personal workspace , New Workspace renamed… 

    … to new Module, Mark as raw removed from personal wrkspace
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    8383c56 View commit details
    Browse the repository at this point in the history

  3. new datagov logo added

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    246dd28 View commit details
    Browse the repository at this point in the history

  4. cross-publish from personal workspace to desk issue is resolved

    amitmoralwar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    3049262 View commit details
    Browse the repository at this point in the history

  5. In simple card,if else block added for mongo and es to displayed thum… 

    …bnail and e-library view modified for files and pages show
    @siddhudhangar
    siddhudhangar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    345bc21 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    2f44c00 View commit details
    Browse the repository at this point in the history

  7. Merge pull request gnowledge#19 from tirthakarmahesh211/beta-release11 

    esBeta release11
    @siddhudhangar
    siddhudhangar authored Apr 19, 2018
    Configuration menu
    Copy the full SHA
    2be5682 View commit details
    Browse the repository at this point in the history

  8. Merge pull request gnowledge#20 from amitmoralwar/cross-publish-new 

    cross-publish from personal workspace to desk issue is resolved
    @siddhudhangar
    siddhudhangar authored Apr 19, 2018
    Configuration menu
    Copy the full SHA
    56e83b5 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    1d4ac1f View commit details
    Browse the repository at this point in the history

  10. misc changes

    @siddhudhangar
    siddhudhangar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    7f1d4c2 View commit details
    Browse the repository at this point in the history

  11. In e-libary view changed for show jsmol also

    @siddhudhangar
    siddhudhangar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    ed0cb37 View commit details
    Browse the repository at this point in the history

  12. misc changes

    @siddhudhangar
    siddhudhangar committed Apr 19, 2018
    Configuration menu
    Copy the full SHA
    a0e7d7a View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2018

  1. In filter Malayalam and aasamese lang added and Module name renamed a… 

    …s Name
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    70db559 View commit details
    Browse the repository at this point in the history

  2. Merge pull request gnowledge#21 from tirthakarmahesh211/beta-release11 

    In filter Malayalam and aasamese lang added and Module name renamed a…
    @siddhudhangar
    siddhudhangar authored Apr 21, 2018
    Configuration menu
    Copy the full SHA
    d87966e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'beta' of https://github.com/gnowledge/gstudio into es-g… 

    …studio-api

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/main_simple_card.html
    @siddhudhangar
    siddhudhangar committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    34d250d View commit details
    Browse the repository at this point in the history

  4. In rating.html file changed,rating issue fixed

    @siddhudhangar
    siddhudhangar committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    ba16d5a View commit details
    Browse the repository at this point in the history

  5. in-line-texteditor.html file changed,added funtion to show alert mess… 

    …age for non-login users
    @siddhudhangar
    siddhudhangar committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    ccd645d View commit details
    Browse the repository at this point in the history

  6. check_user_access_policy changed and user.is_authenticated changed in… 

    … rating.html
    @siddhudhangar
    siddhudhangar committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    d113e3e View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2018

  1. In widget_user_search.html,replaced text Find Students to Find Members

    @siddhudhangar
    siddhudhangar committed Apr 22, 2018
    Configuration menu
    Copy the full SHA
    f3943ef View commit details
    Browse the repository at this point in the history

  2. In lms.html file chenge,for show gallery text on tab except home work… 

    …space
    @siddhudhangar
    siddhudhangar committed Apr 22, 2018
    Configuration menu
    Copy the full SHA
    813e7b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. Atleast keyword added in registration page

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    16cc855 View commit details
    Browse the repository at this point in the history

  2. activity player changes reverted

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    1d5c13f View commit details
    Browse the repository at this point in the history

  3. Miscellenous changes

    amitmoralwar committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    fac8049 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2018

  1. in-line-texteditor.html file changed,added js funtion to show alert m… 

    …essage for non-login users when user click on comment button
    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    094e14b View commit details
    Browse the repository at this point in the history

  2. In rating.html file changed,added input type hidden field for csrf_to… 

    …ken,group_id,is_authenticated.rating issue resolved
    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    06ed35c View commit details
    Browse the repository at this point in the history

  3. In lms.html file changed,showing 'gallery' text on all workspaces tab… 

    … except home workspace
    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    d6ebc50 View commit details
    Browse the repository at this point in the history

  4. In widget_user_search.html,replaced text Find Students to Find Members

    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    05e716e View commit details
    Browse the repository at this point in the history

  5. Merge pull request gnowledge#22 from tirthakarmahesh211/beta-release11 

    Atleast keyword added in registration page and help page css issue fixed
    @siddhudhangar
    siddhudhangar authored Apr 24, 2018
    Configuration menu
    Copy the full SHA
    f542f83 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'beta' of https://github.com/gnowledge/gstudio into es-g… 

    …studio-api
    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    092a44b View commit details
    Browse the repository at this point in the history

  7. My Worksapaces and My Progess are added in trans tag

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    3c24fff View commit details
    Browse the repository at this point in the history

  8. Merge pull request gnowledge#23 from tirthakarmahesh211/beta-release11 

    Trans tags are added for new words
    @siddhudhangar
    siddhudhangar authored Apr 24, 2018
    Configuration menu
    Copy the full SHA
    c008859 View commit details
    Browse the repository at this point in the history

  9. In method.py file,group_obj argument of user_access_policy() funtion … 

    …replaced to group_obj._id argument
    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    081509a View commit details
    Browse the repository at this point in the history

  10. Merge pull request gnowledge#24 from amitmoralwar/card-list 

    Miscellenous changes
    @siddhudhangar
    siddhudhangar authored Apr 24, 2018
    Configuration menu
    Copy the full SHA
    0dae6b2 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    e322866 View commit details
    Browse the repository at this point in the history

  12. trans added for other words

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    6905b34 View commit details
    Browse the repository at this point in the history

  13. responsive code added for lms_secondary header

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    e71973e View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. In e-libary view,ebooks files displayed

    @siddhudhangar
    siddhudhangar committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    01d71d7 View commit details
    Browse the repository at this point in the history

  2. css for mobile navigation in activity player and some new trans tags,… 

    … help page css added
    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    3b43735 View commit details
    Browse the repository at this point in the history

  3. In home.py file,attribute_set.educationaluse query added in a file

    @siddhudhangar
    siddhudhangar committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    e35ddd7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'nroer_beta' of https://github.com/siddhudhangar/gstudio … 

    …into es-gstudio-api

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/lms.html
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/rating.html
    @siddhudhangar
    siddhudhangar committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    7e5c536 View commit details
    Browse the repository at this point in the history

  5. In home.py file,attribute_set.educationaluse query added in a file

    @siddhudhangar
    siddhudhangar committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    d9ffe32 View commit details
    Browse the repository at this point in the history

  6. In home.py file,attribute_set.educationaluse query added in a file

    @siddhudhangar
    siddhudhangar committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    f174f45 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. In in-line-texteditor.html file, whole file replaced with master code… 

    … from gnowledge
    @siddhudhangar
    siddhudhangar committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    a169c8f View commit details
    Browse the repository at this point in the history

  2. In home.py file,added ES query for eresources count

    @siddhudhangar
    siddhudhangar committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    70a8f6f View commit details
    Browse the repository at this point in the history

  3. In advanced_search.py file,page resourced excluded from search

    @siddhudhangar
    siddhudhangar committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    29e56cb View commit details
    Browse the repository at this point in the history

  4. conflicts resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    0aad8ce View commit details
    Browse the repository at this point in the history

  5. CSS added for activity navigation; New Trans tag;

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    8495ef0 View commit details
    Browse the repository at this point in the history

  6. conflicts removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    2fe1307 View commit details
    Browse the repository at this point in the history

  7. misc changes like removed print statement and unwanted stuffs

    @siddhudhangar
    siddhudhangar committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    53ccd35 View commit details
    Browse the repository at this point in the history

  8. Merge pull request gnowledge#26 from tirthakarmahesh211/beta-release11 

    CSS added for Navigation in Activity player , Some trans tags added; CSS for Lms sec Header
    @siddhudhangar
    siddhudhangar authored Apr 26, 2018
    Configuration menu
    Copy the full SHA
    a63539c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'nroer_beta' of https://github.com/siddhudhangar/gstudio … 

    …into es-gstudio-api

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/in-line-texteditor.html
    @siddhudhangar
    siddhudhangar committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    213c9c7 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2018

  1. Add filter css issue fixed

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 1, 2018
    Configuration menu
    Copy the full SHA
    6375fb9 View commit details
    Browse the repository at this point in the history

  2. In es.py file, es_filters static method added

    @siddhudhangar
    siddhudhangar committed May 1, 2018
    Configuration menu
    Copy the full SHA
    1ba0b59 View commit details
    Browse the repository at this point in the history

  3. In simple_card.html, Object ID's removed and one method added in ndf_… 

    …tags i.e get_member_of_list()
    @siddhudhangar
    siddhudhangar committed May 1, 2018
    Configuration menu
    Copy the full SHA
    61cd66f View commit details
    Browse the repository at this point in the history

  4. In ndf_tags file, new get_member_of_list() method added for accessing… 

    … resource.member_of value
    @siddhudhangar
    siddhudhangar committed May 1, 2018
    Configuration menu
    Copy the full SHA
    f54de41 View commit details
    Browse the repository at this point in the history

  5. In e-book.py and e-libary.py, all filter code moved to es_filters() m… 

    …ethod that is included in esearch class
    @siddhudhangar
    siddhudhangar committed May 1, 2018
    Configuration menu
    Copy the full SHA
    b879051 View commit details
    Browse the repository at this point in the history

  6. In advanced_search.py file, new interactive_page gsystemtype added in… 

    … mongo query to displayed interactive page also while searching
    @siddhudhangar
    siddhudhangar committed May 1, 2018
    Configuration menu
    Copy the full SHA
    c8f80d6 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2018

  1. 500 internal server page added

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    7bfe8bb View commit details
    Browse the repository at this point in the history

  2. clear button trans added

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    f1f7ffb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into beta-release11
    @tirthakarmahesh211
    tirthakarmahesh211 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    544275f View commit details
    Browse the repository at this point in the history

  4. 500 error page edited

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    6afdca2 View commit details
    Browse the repository at this point in the history

  5. filter selector css fixed

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    92b07e8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request gnowledge#27 from tirthakarmahesh211/beta-release11 

    Filter select box moved to left
    @siddhudhangar
    siddhudhangar authored May 2, 2018
    Configuration menu
    Copy the full SHA
    2694b8d View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. Image ,video and audio dashboard html page added filter and search fu… 

    …nctionality
    @siddhudhangar
    siddhudhangar committed May 3, 2018
    Configuration menu
    Copy the full SHA
    336b5c7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed May 3, 2018
    Configuration menu
    Copy the full SHA
    3da419e View commit details
    Browse the repository at this point in the history

Commits on May 4, 2018

  1. Merge branch 'beta' of https://github.com/gnowledge/gstudio into beta

    amitmoralwar committed May 4, 2018
    Configuration menu
    Copy the full SHA
    ed84c92 View commit details
    Browse the repository at this point in the history

  2. Changes related oauth login

    amitmoralwar committed May 4, 2018
    Configuration menu
    Copy the full SHA
    2df4830 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2018

  1. Update sync_existing_document with access_token of mastodon

    amitmoralwar committed May 6, 2018
    Configuration menu
    Copy the full SHA
    a2757c4 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. iframe css issue fixed and new slider images added also arrow buttons… 

    … are added on slider
    @tirthakarmahesh211
    tirthakarmahesh211 committed May 7, 2018
    1 Configuration menu
    Copy the full SHA
    4475010 View commit details
    Browse the repository at this point in the history

  2. Merge pull request gnowledge#29 from tirthakarmahesh211/beta-maychanges 

    iframe css issue fixed and new slider images added also arrow buttons…
    @siddhudhangar
    siddhudhangar authored May 7, 2018
    Configuration menu
    Copy the full SHA
    834112e View commit details
    Browse the repository at this point in the history

  3. Image ,video and audio dashboard html page added filter and search fu… 

    …nctionality and running on ES
    @siddhudhangar
    siddhudhangar committed May 7, 2018
    Configuration menu
    Copy the full SHA
    7c2a26e View commit details
    Browse the repository at this point in the history

Commits on May 8, 2018

  1. In audio and video dashboard view,remove search_text from if conditon… 

    … to search function work even without text
    @siddhudhangar
    siddhudhangar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    f399bfd View commit details
    Browse the repository at this point in the history

  2. advanced_search page not accessible for normal user

    @siddhudhangar
    siddhudhangar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    4c336c5 View commit details
    Browse the repository at this point in the history

  3. copyright select options issue resolved

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 8, 2018
    Configuration menu
    Copy the full SHA
    ce8745f View commit details
    Browse the repository at this point in the history

  4. Remove unnecessary function

    amitmoralwar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    b38e163 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'misc-updates' of https://github.com/amitmoralwar/gstudio … 

    …into misc-updates
    amitmoralwar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    23e7a80 View commit details
    Browse the repository at this point in the history

  6. Remove unncessary code

    amitmoralwar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    8a1499c View commit details
    Browse the repository at this point in the history

  7. Remove unnecessary code

    amitmoralwar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    6b7fe24 View commit details
    Browse the repository at this point in the history

  8. some changes in oauth file

    amitmoralwar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    cd03400 View commit details
    Browse the repository at this point in the history

  9. remove redudancy from code

    amitmoralwar committed May 8, 2018
    Configuration menu
    Copy the full SHA
    7ab7edf View commit details
    Browse the repository at this point in the history

Commits on May 9, 2018

  1. suggested changes

    amitmoralwar committed May 9, 2018
    Configuration menu
    Copy the full SHA
    bbcc164 View commit details
    Browse the repository at this point in the history

  2. anchor tab added for workspace and eresources on landing page

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    af3c796 View commit details
    Browse the repository at this point in the history

  3. infobox added for metadata

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    e72af41 View commit details
    Browse the repository at this point in the history

  4. authoring tabs placed into settings button

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    c2c111a View commit details
    Browse the repository at this point in the history

  5. Changes made in username,email label

    amitmoralwar committed May 9, 2018
    Configuration menu
    Copy the full SHA
    131b2d1 View commit details
    Browse the repository at this point in the history

  6. lms secondary header is updated with foundation classes

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 9, 2018
    Configuration menu
    Copy the full SHA
    dc1b41a View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. table added for metadat content

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    3340b0f View commit details
    Browse the repository at this point in the history

  2. responsive classes added for lms header

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    6fde022 View commit details
    Browse the repository at this point in the history

  3. Foundation classes added for lms sec page and setting button

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    b67790d View commit details
    Browse the repository at this point in the history

  4. delete option in setting moved to down

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    cecb20e View commit details
    Browse the repository at this point in the history

  5. Merge pull request gnowledge#31 from tirthakarmahesh211/beta-maychanges 

    Infobox added for metadata, LMS secondary header partially made responsive
    @siddhudhangar
    siddhudhangar authored May 10, 2018
    Configuration menu
    Copy the full SHA
    ac91b19 View commit details
    Browse the repository at this point in the history

  6. registered users link removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    7e699ca View commit details
    Browse the repository at this point in the history

Commits on May 11, 2018

  1. Merge pull request gnowledge#32 from tirthakarmahesh211/beta-maychanges 

    Removed link from Registerd users card
    @siddhudhangar
    siddhudhangar authored May 11, 2018
    Configuration menu
    Copy the full SHA
    51829ec View commit details
    Browse the repository at this point in the history

  2. .join filter removed

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 11, 2018
    Configuration menu
    Copy the full SHA
    a8e9a20 View commit details
    Browse the repository at this point in the history

  3. Merge pull request gnowledge#33 from tirthakarmahesh211/beta-maychanges 

    join filter removed
    @siddhudhangar
    siddhudhangar authored May 11, 2018
    Configuration menu
    Copy the full SHA
    2d91fd8 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. removed setting variable name from view and use site varibale in temp… 

    …lates
    @siddhudhangar
    siddhudhangar committed May 14, 2018
    Configuration menu
    Copy the full SHA
    06c7859 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api
    @siddhudhangar
    siddhudhangar committed May 14, 2018
    Configuration menu
    Copy the full SHA
    1eec6d2 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. In node_details_base.html,url_name changed and userDashboard view, _i… 

    …d added in dict and one variable added in setting file
    @siddhudhangar
    siddhudhangar committed May 15, 2018
    Configuration menu
    Copy the full SHA
    80f7b45 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2018

  1. added new save_to_es method

    @siddhudhangar
    siddhudhangar committed May 16, 2018
    Configuration menu
    Copy the full SHA
    42f7bfe View commit details
    Browse the repository at this point in the history

  2. all models files except buddy,added new rcs_function() method and tha… 

    …t function added in celery
    @siddhudhangar
    siddhudhangar committed May 16, 2018
    Configuration menu
    Copy the full SHA
    d7d3758 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. es_tags.py file created for analytics in templatetags folder,download… 

    … count for file beside download button and popular url defined
    @siddhudhangar
    siddhudhangar committed May 17, 2018
    Configuration menu
    Copy the full SHA
    43d0202 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2018

  1. more info button added and ccbysa added

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    d678115 View commit details
    Browse the repository at this point in the history

  2. ccbysa image added

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    031fb11 View commit details
    Browse the repository at this point in the history

  3. join with commas method added in ndf tags

    @tirthakarmahesh211
    tirthakarmahesh211 committed May 21, 2018
    Configuration menu
    Copy the full SHA
    c911e82 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. Merge pull request gnowledge#34 from tirthakarmahesh211/beta-maychanges 

    Beta maychanges
    @siddhudhangar
    siddhudhangar authored May 22, 2018
    Configuration menu
    Copy the full SHA
    1d008db View commit details
    Browse the repository at this point in the history

  2. In ndf_tags file, get_group_type() method,we added popular keyword in… 

    … list
    @siddhudhangar
    siddhudhangar committed May 22, 2018
    Configuration menu
    Copy the full SHA
    986c824 View commit details
    Browse the repository at this point in the history

  3. In node_ajax_content.html,height and width commented in ebub setting … 

    …and no. of downloads added
    @siddhudhangar
    siddhudhangar committed May 22, 2018
    Configuration menu
    Copy the full SHA
    82f3473 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst… 

    …udio into es-gstudio-api

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templatetags/ndf_tags.py
    @siddhudhangar
    siddhudhangar committed May 22, 2018
    Configuration menu
    Copy the full SHA
    ed92b44 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2018

  1. In triple.py file,rcs_function method move one level back..now rcs_fu… 

    …nction accessible
    @siddhudhangar
    siddhudhangar committed May 23, 2018
    Configuration menu
    Copy the full SHA
    539ff3a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'es-gstudio-api' into misc-updates

    @siddhudhangar
    siddhudhangar authored May 23, 2018
    Configuration menu
    Copy the full SHA
    10afd97 View commit details
    Browse the repository at this point in the history