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

Misc updates #1970

Open
wants to merge 537 commits into
base: beta
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
537 commits
Select commit Hold shift + click to select a range
1d39621
add_asset changes reverted back
tirthakarmahesh211 Apr 6, 2018
61f6467
add_asset template changes reverted
tirthakarmahesh211 Apr 6, 2018
c52d5bf
search and adv seach commented in _init.py
tirthakarmahesh211 Apr 7, 2018
2ae8a78
Search button fixed on right nav
tirthakarmahesh211 Apr 7, 2018
1a4227d
Merge pull request #2 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 8, 2018
96403ba
created some custom ndf_tags to convert 13 digit number to date
siddhudhangar Apr 8, 2018
16860b6
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 8, 2018
87c9abe
Merge branch 'es-gstudio-api' into beta-release11
siddhudhangar Apr 8, 2018
3a66c6b
Merge pull request #4 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 8, 2018
822fa94
for hindi ... some changes in main_simple_card.html....
siddhudhangar Apr 8, 2018
ba5205f
In Lang menu white space removed
tirthakarmahesh211 Apr 8, 2018
cd49ec1
conflicts resolved
tirthakarmahesh211 Apr 8, 2018
0cc88cf
Oauth code for login
Apr 8, 2018
954cb52
my desk z key removed
tirthakarmahesh211 Apr 9, 2018
39abf71
my desk text in hindi set properly
tirthakarmahesh211 Apr 9, 2018
1a3a461
for advanced_search ..... teaches query modified
siddhudhangar Apr 9, 2018
b44599d
Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21…
tirthakarmahesh211 Apr 9, 2018
0fcb057
partner view ... added code for hindi text
siddhudhangar Apr 9, 2018
50c7cc9
partner view ... added code for hindi text
siddhudhangar Apr 9, 2018
f78a817
repository.html and main_simple_card.html file changed for hindi text…
siddhudhangar Apr 9, 2018
d683191
Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21…
siddhudhangar Apr 9, 2018
dc3b8b9
conflicts resolved
tirthakarmahesh211 Apr 9, 2018
18d2647
conflicts resolved
tirthakarmahesh211 Apr 9, 2018
5a89a50
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 9, 2018
0a10508
Fixes in oauth module
Apr 9, 2018
83b09a4
my-progeunwanted space removed
tirthakarmahesh211 Apr 9, 2018
de7ce2e
about us blog background color changed
tirthakarmahesh211 Apr 9, 2018
4389e24
Login using mastodon oauth
Apr 9, 2018
186f92d
Merge pull request #5 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 9, 2018
a53fbfd
gbase_wrap min-height commented
tirthakarmahesh211 Apr 9, 2018
66e6086
Modify 2 files for code merging by removing unwanted code
Apr 9, 2018
c1f9909
Merge branch 'es-gstudio-api' into card-list
siddhudhangar Apr 9, 2018
ada5227
Merge pull request #6 from amitmoralwar/card-list
siddhudhangar Apr 9, 2018
57c4a0b
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 9, 2018
09d904d
add asset form validation fixed
tirthakarmahesh211 Apr 9, 2018
166dcfd
Merge pull request #7 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 9, 2018
ac7932a
changed version of mastodon in requirement.txt
siddhudhangar Apr 9, 2018
3400887
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 9, 2018
1b4e4b8
deleted mastodon two files
siddhudhangar Apr 9, 2018
efaefa1
node.py and filehive.py file modified.... import statement removed
siddhudhangar Apr 9, 2018
ad004f1
conflicts resolved
tirthakarmahesh211 Apr 9, 2018
8efc842
header_clix elasticsearch code commented
siddhudhangar Apr 9, 2018
9b99ff8
sform.html commented and jquery=3.1.1 removed
siddhudhangar Apr 9, 2018
c5f32e4
changes reverted back - course_pages course_about div removed gbase c…
tirthakarmahesh211 Apr 9, 2018
03b71de
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 10, 2018
c3f5ff6
eCourses card linked to explore_courses
tirthakarmahesh211 Apr 10, 2018
9003571
ImageDashboard.html and ImageDashboard.py views changed ... added sel…
siddhudhangar Apr 10, 2018
c18104f
File modified in login with mastodon
Apr 10, 2018
c4514a1
Login with mastodon file modified
Apr 10, 2018
2bc191c
Merge pull request #8 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 10, 2018
52ab592
Merge pull request #9 from amitmoralwar/card-list
siddhudhangar Apr 10, 2018
6699677
New images added for slider and in login css fixed
tirthakarmahesh211 Apr 10, 2018
54eccdc
slider images added
tirthakarmahesh211 Apr 10, 2018
5abe410
In create page required field alert is fixed properly
tirthakarmahesh211 Apr 10, 2018
d6a6a8b
In e-library ... removed file value in member_of attribute... for sho…
siddhudhangar Apr 10, 2018
75544f4
Total nos of discussion added on landing page
tirthakarmahesh211 Apr 10, 2018
39d8e35
old slider images removed
tirthakarmahesh211 Apr 10, 2018
337bf73
Merge branch 'es-gstudio-api' into beta-release11
siddhudhangar Apr 11, 2018
e2d5dee
Merge pull request #10 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 11, 2018
d33689d
e-library query modified for pages
siddhudhangar Apr 11, 2018
5b99a32
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 11, 2018
4216492
on partners cards striptags added
tirthakarmahesh211 Apr 11, 2018
3f33828
e-library pages showed properly
siddhudhangar Apr 11, 2018
31765f5
issue resolved
siddhudhangar Apr 11, 2018
77d0864
Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21…
tirthakarmahesh211 Apr 11, 2018
057b88c
Merge pull request #11 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 11, 2018
e9fb3c7
remove pages option from e-library
siddhudhangar Apr 11, 2018
2328050
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 11, 2018
0000adb
removed pages option from e-librayr
siddhudhangar Apr 11, 2018
72689e4
who we are blog removed and also watermark logo fixed
tirthakarmahesh211 Apr 11, 2018
6874da2
analytics blog size reduced
tirthakarmahesh211 Apr 11, 2018
5b1bbe4
Merge pull request #12 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 11, 2018
4c24a07
event and partner issue resolved
siddhudhangar Apr 11, 2018
669400b
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 11, 2018
f8f6491
some minor issue fixed
siddhudhangar Apr 11, 2018
e157b34
Merge branch 'beta' of https://github.com/gnowledge/gstudio into card…
Apr 11, 2018
825b16e
gnowledge:beta branch with siddhudhangar:es-gstudio-api
siddhudhangar Apr 11, 2018
5651470
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 11, 2018
13f673a
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
Apr 11, 2018
18b07f2
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 11, 2018
e16b6ed
misc issue resolved
siddhudhangar Apr 11, 2018
bfd2fc7
files and pages both resources displayed on e-library
siddhudhangar Apr 12, 2018
d99919b
added two variable in setting file .... GSTUDIO_ELASTIC_SEARCH_IN_NOD…
siddhudhangar Apr 12, 2018
69bbd7b
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
Apr 12, 2018
c06a547
misc changes ..
siddhudhangar Apr 12, 2018
376a044
local and global search option removed from search bar
siddhudhangar Apr 12, 2018
afc5c77
Topic map and calendar removed from complete site
tirthakarmahesh211 Apr 12, 2018
ca4cbcb
calendar and topic map commented from lms_sec_header
tirthakarmahesh211 Apr 12, 2018
a4edff5
In ndf_tags, get_sg_member_of method,we added if conditon to check no…
siddhudhangar Apr 12, 2018
e992226
removed extra spaces
tirthakarmahesh211 Apr 12, 2018
9cc7a8a
Merge branch 'es-gstudio-api' into beta-release11
siddhudhangar Apr 12, 2018
4cc26a2
Merge pull request #13 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 12, 2018
c0e148c
dev/template/ url added
siddhudhangar Apr 12, 2018
7ce791f
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 12, 2018
1d5b7a3
new images added and homogenous word added in poa
tirthakarmahesh211 Apr 12, 2018
cdbbaf6
Merge branch 'beta-release11' of https://github.com/tirthakarmahesh21…
tirthakarmahesh211 Apr 12, 2018
8b433c7
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 12, 2018
25e3e62
search box fixed on right
tirthakarmahesh211 Apr 12, 2018
cb1b303
footer trans tag issue resolved
siddhudhangar Apr 13, 2018
aaf0e26
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
Apr 13, 2018
4c44cba
search box moved to right after click...
siddhudhangar Apr 13, 2018
b71931f
Interaction setting-discuss in top right has same UI as discuss in bo…
Apr 13, 2018
e268a3c
search box fixed
tirthakarmahesh211 Apr 13, 2018
90056d3
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 13, 2018
d6d49b5
conflicts resolved
tirthakarmahesh211 Apr 13, 2018
746d371
eResourses and discussion added in po
tirthakarmahesh211 Apr 13, 2018
93ae902
Merge pull request #14 from amitmoralwar/card-list
siddhudhangar Apr 13, 2018
e66ba19
search box code reomved
tirthakarmahesh211 Apr 13, 2018
39a49a0
Merge pull request #15 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 13, 2018
c882f21
search box moved to right after click...
siddhudhangar Apr 13, 2018
52c6b16
merge branch beta-release11 with es-gstudio-api
siddhudhangar Apr 13, 2018
f77877f
all files option default now in e-library
siddhudhangar Apr 13, 2018
c3f36bc
only files showed ... pages removed from e-library except interactives
siddhudhangar Apr 13, 2018
660f8b2
In module view .. if not gstaff_access and module_obj.agency_type != …
siddhudhangar Apr 14, 2018
33edc30
ebook.html and ebook.py .... some code modified for worked both ES an…
siddhudhangar Apr 15, 2018
f8779fb
Update sync_existing_document to add access_token field for existing …
Apr 15, 2018
1634f0e
Update sync_existing_document to add access_token field for existing …
Apr 15, 2018
3d03d55
Merge pull request #16 from amitmoralwar/card-list
siddhudhangar Apr 15, 2018
085d191
es_injection.py file modified
siddhudhangar Apr 15, 2018
7b5efdd
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 15, 2018
d678760
removed get filter from ndf_tags file
siddhudhangar Apr 16, 2018
8d264e5
dev query url uncommented
tirthakarmahesh211 Apr 16, 2018
a4b5079
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 16, 2018
9362460
uncomment advanced_search url from urls/__init__.py
siddhudhangar Apr 16, 2018
a06b107
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Apr 16, 2018
90122a0
all audio images shown default images in e-library ... now issue reso…
siddhudhangar Apr 16, 2018
469224f
In simple card, added if else conditon for mongo and ES
siddhudhangar Apr 17, 2018
79ce38b
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 17, 2018
e5abd2b
oined button removed from Partner showcases cards and some trans are …
tirthakarmahesh211 Apr 17, 2018
6b89534
create partner ,simple card code modified, enable advanced search
siddhudhangar Apr 17, 2018
06b1fef
old partners show old e-library ui.... new Partner show workspace ui
siddhudhangar Apr 18, 2018
8da6d79
New trans added
tirthakarmahesh211 Apr 18, 2018
74d2bc5
write block from activity player is removed
tirthakarmahesh211 Apr 18, 2018
bab06c9
conflicts removed
tirthakarmahesh211 Apr 18, 2018
58a682e
video,audio,image downloaded along with filename in any language
Apr 18, 2018
5e4ea36
In search_views,exclude code for thumbnail and profile picture
siddhudhangar Apr 18, 2018
044d10a
Merge branch 'es-gstudio-api' into beta-release11
siddhudhangar Apr 18, 2018
f7c31ea
Merge pull request #18 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 18, 2018
af4369f
Merge pull request #17 from amitmoralwar/card-list
siddhudhangar Apr 18, 2018
0ffae4a
conflicts resolved
tirthakarmahesh211 Apr 18, 2018
b5a82c6
Telugu lang option removed from lang dropdown
tirthakarmahesh211 Apr 19, 2018
8383c56
Resource menu removed from personal workspace , New Workspace renamed…
tirthakarmahesh211 Apr 19, 2018
246dd28
new datagov logo added
tirthakarmahesh211 Apr 19, 2018
3049262
cross-publish from personal workspace to desk issue is resolved
Apr 19, 2018
345bc21
In simple card,if else block added for mongo and es to displayed thum…
siddhudhangar Apr 19, 2018
2f44c00
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 19, 2018
2be5682
Merge pull request #19 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 19, 2018
56e83b5
Merge pull request #20 from amitmoralwar/cross-publish-new
siddhudhangar Apr 19, 2018
1d4ac1f
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 19, 2018
7f1d4c2
misc changes
siddhudhangar Apr 19, 2018
ed0cb37
In e-libary view changed for show jsmol also
siddhudhangar Apr 19, 2018
a0e7d7a
misc changes
siddhudhangar Apr 19, 2018
70db559
In filter Malayalam and aasamese lang added and Module name renamed a…
tirthakarmahesh211 Apr 21, 2018
d87966e
Merge pull request #21 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 21, 2018
34d250d
Merge branch 'beta' of https://github.com/gnowledge/gstudio into es-g…
siddhudhangar Apr 21, 2018
ba16d5a
In rating.html file changed,rating issue fixed
siddhudhangar Apr 21, 2018
ccd645d
in-line-texteditor.html file changed,added funtion to show alert mess…
siddhudhangar Apr 21, 2018
d113e3e
check_user_access_policy changed and user.is_authenticated changed in…
siddhudhangar Apr 21, 2018
f3943ef
In widget_user_search.html,replaced text Find Students to Find Members
siddhudhangar Apr 22, 2018
813e7b5
In lms.html file chenge,for show gallery text on tab except home work…
siddhudhangar Apr 22, 2018
16cc855
Atleast keyword added in registration page
tirthakarmahesh211 Apr 23, 2018
1d5c13f
activity player changes reverted
tirthakarmahesh211 Apr 23, 2018
fac8049
Miscellenous changes
Apr 23, 2018
094e14b
in-line-texteditor.html file changed,added js funtion to show alert m…
siddhudhangar Apr 24, 2018
06ed35c
In rating.html file changed,added input type hidden field for csrf_to…
siddhudhangar Apr 24, 2018
d6ebc50
In lms.html file changed,showing 'gallery' text on all workspaces tab…
siddhudhangar Apr 24, 2018
05e716e
In widget_user_search.html,replaced text Find Students to Find Members
siddhudhangar Apr 24, 2018
f542f83
Merge pull request #22 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 24, 2018
092a44b
Merge branch 'beta' of https://github.com/gnowledge/gstudio into es-g…
siddhudhangar Apr 24, 2018
3c24fff
My Worksapaces and My Progess are added in trans tag
tirthakarmahesh211 Apr 24, 2018
c008859
Merge pull request #23 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 24, 2018
081509a
In method.py file,group_obj argument of user_access_policy() funtion …
siddhudhangar Apr 24, 2018
0dae6b2
Merge pull request #24 from amitmoralwar/card-list
siddhudhangar Apr 24, 2018
e322866
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Apr 24, 2018
6905b34
trans added for other words
tirthakarmahesh211 Apr 24, 2018
e71973e
responsive code added for lms_secondary header
tirthakarmahesh211 Apr 24, 2018
01d71d7
In e-libary view,ebooks files displayed
siddhudhangar Apr 25, 2018
3b43735
css for mobile navigation in activity player and some new trans tags,…
tirthakarmahesh211 Apr 25, 2018
e35ddd7
In home.py file,attribute_set.educationaluse query added in a file
siddhudhangar Apr 25, 2018
7e5c536
Merge branch 'nroer_beta' of https://github.com/siddhudhangar/gstudio…
siddhudhangar Apr 25, 2018
d9ffe32
In home.py file,attribute_set.educationaluse query added in a file
siddhudhangar Apr 25, 2018
f174f45
In home.py file,attribute_set.educationaluse query added in a file
siddhudhangar Apr 25, 2018
a169c8f
In in-line-texteditor.html file, whole file replaced with master code…
siddhudhangar Apr 26, 2018
70a8f6f
In home.py file,added ES query for eresources count
siddhudhangar Apr 26, 2018
29e56cb
In advanced_search.py file,page resourced excluded from search
siddhudhangar Apr 26, 2018
0aad8ce
conflicts resolved
tirthakarmahesh211 Apr 26, 2018
8495ef0
CSS added for activity navigation; New Trans tag;
tirthakarmahesh211 Apr 26, 2018
2fe1307
conflicts removed
tirthakarmahesh211 Apr 26, 2018
53ccd35
misc changes like removed print statement and unwanted stuffs
siddhudhangar Apr 26, 2018
a63539c
Merge pull request #26 from tirthakarmahesh211/beta-release11
siddhudhangar Apr 26, 2018
213c9c7
Merge branch 'nroer_beta' of https://github.com/siddhudhangar/gstudio…
siddhudhangar Apr 26, 2018
6375fb9
Add filter css issue fixed
tirthakarmahesh211 May 1, 2018
1ba0b59
In es.py file, es_filters static method added
siddhudhangar May 1, 2018
61cd66f
In simple_card.html, Object ID's removed and one method added in ndf…
siddhudhangar May 1, 2018
f54de41
In ndf_tags file, new get_member_of_list() method added for accessing…
siddhudhangar May 1, 2018
b879051
In e-book.py and e-libary.py, all filter code moved to es_filters() m…
siddhudhangar May 1, 2018
c8f80d6
In advanced_search.py file, new interactive_page gsystemtype added in…
siddhudhangar May 1, 2018
7bfe8bb
500 internal server page added
tirthakarmahesh211 May 2, 2018
f1f7ffb
clear button trans added
tirthakarmahesh211 May 2, 2018
544275f
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 May 2, 2018
6afdca2
500 error page edited
tirthakarmahesh211 May 2, 2018
92b07e8
filter selector css fixed
tirthakarmahesh211 May 2, 2018
2694b8d
Merge pull request #27 from tirthakarmahesh211/beta-release11
siddhudhangar May 2, 2018
336b5c7
Image ,video and audio dashboard html page added filter and search fu…
siddhudhangar May 3, 2018
3da419e
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar May 3, 2018
ed84c92
Merge branch 'beta' of https://github.com/gnowledge/gstudio into beta
May 4, 2018
2df4830
Changes related oauth login
May 4, 2018
a2757c4
Update sync_existing_document with access_token of mastodon
May 6, 2018
4475010
iframe css issue fixed and new slider images added also arrow buttons…
tirthakarmahesh211 May 7, 2018
834112e
Merge pull request #29 from tirthakarmahesh211/beta-maychanges
siddhudhangar May 7, 2018
7c2a26e
Image ,video and audio dashboard html page added filter and search fu…
siddhudhangar May 7, 2018
f399bfd
In audio and video dashboard view,remove search_text from if conditon…
siddhudhangar May 8, 2018
4c336c5
advanced_search page not accessible for normal user
siddhudhangar May 8, 2018
ce8745f
copyright select options issue resolved
tirthakarmahesh211 May 8, 2018
b38e163
Remove unnecessary function
May 8, 2018
23e7a80
Merge branch 'misc-updates' of https://github.com/amitmoralwar/gstudi…
May 8, 2018
8a1499c
Remove unncessary code
May 8, 2018
6b7fe24
Remove unnecessary code
May 8, 2018
cd03400
some changes in oauth file
May 8, 2018
7ab7edf
remove redudancy from code
May 8, 2018
bbcc164
suggested changes
May 9, 2018
af3c796
anchor tab added for workspace and eresources on landing page
tirthakarmahesh211 May 9, 2018
e72af41
infobox added for metadata
tirthakarmahesh211 May 9, 2018
c2c111a
authoring tabs placed into settings button
tirthakarmahesh211 May 9, 2018
131b2d1
Changes made in username,email label
May 9, 2018
dc1b41a
lms secondary header is updated with foundation classes
tirthakarmahesh211 May 9, 2018
3340b0f
table added for metadat content
tirthakarmahesh211 May 10, 2018
6fde022
responsive classes added for lms header
tirthakarmahesh211 May 10, 2018
b67790d
Foundation classes added for lms sec page and setting button
tirthakarmahesh211 May 10, 2018
cecb20e
delete option in setting moved to down
tirthakarmahesh211 May 10, 2018
ac91b19
Merge pull request #31 from tirthakarmahesh211/beta-maychanges
siddhudhangar May 10, 2018
7e699ca
registered users link removed
tirthakarmahesh211 May 10, 2018
51829ec
Merge pull request #32 from tirthakarmahesh211/beta-maychanges
siddhudhangar May 11, 2018
a8e9a20
.join filter removed
tirthakarmahesh211 May 11, 2018
2d91fd8
Merge pull request #33 from tirthakarmahesh211/beta-maychanges
siddhudhangar May 11, 2018
06c7859
removed setting variable name from view and use site varibale in tem…
siddhudhangar May 14, 2018
1eec6d2
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar May 14, 2018
80f7b45
In node_details_base.html,url_name changed and userDashboard view, _i…
siddhudhangar May 15, 2018
42f7bfe
added new save_to_es method
siddhudhangar May 16, 2018
d7d3758
all models files except buddy,added new rcs_function() method and tha…
siddhudhangar May 16, 2018
43d0202
es_tags.py file created for analytics in templatetags folder,download…
siddhudhangar May 17, 2018
d678115
more info button added and ccbysa added
tirthakarmahesh211 May 21, 2018
031fb11
ccbysa image added
tirthakarmahesh211 May 21, 2018
c911e82
join with commas method added in ndf tags
tirthakarmahesh211 May 21, 2018
1d008db
Merge pull request #34 from tirthakarmahesh211/beta-maychanges
siddhudhangar May 22, 2018
986c824
In ndf_tags file, get_group_type() method,we added popular keyword in…
siddhudhangar May 22, 2018
82f3473
In node_ajax_content.html,height and width commented in ebub setting …
siddhudhangar May 22, 2018
ed92b44
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar May 22, 2018
539ff3a
In triple.py file,rcs_function method move one level back..now rcs_fu…
siddhudhangar May 23, 2018
10afd97
Merge branch 'es-gstudio-api' into misc-updates
siddhudhangar May 23, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions doc/deployer/Migrating_SQLite_DB_to_PostgreSQL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ alter sequence auth_user_id_seq restart
# Tabing BACKUP/DUMP of all DBs and table
pg_dumpall > file-name.sql

-- OR --
echo "pg_dumpall > /tmp/file-name.sql" | sudo su - postgres
# In above case, permission denied exception might gets raised to create file under `/tmp/`
-- OR --
echo "pg_dumpall > file-name.sql" | sudo su - postgres
# In above case file-name.sql will be created under `/var/lib/postgresql/` folder

# DROP database
$ sudo su - postgres
Expand Down
133 changes: 133 additions & 0 deletions doc/deployer/es_initialize.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# from bson import json_util
# import os
# import sys
# import json
# from elasticsearch import Elasticsearch
# from gnowsys_ndf.ndf.models import *

# from gnowsys_ndf.settings import GSTUDIO_SITE_NAME
# from gnowsys_ndf.local_settings import *


# ##### use the below commented lines if you are working with Python 2.x #####
# # reload(sys)
# # sys.setdefaultencoding('UTF8')

# es = Elasticsearch(GSTUDIO_ELASTIC_SEARCH_PROTOCOL+"://"+GSTUDIO_ELASTIC_SEARCH_SUPERUSER+":"+GSTUDIO_ELASTIC_SEARCH_SUPERUSER_PASSWORD+"@"+GSTUDIO_ELASTIC_SEARCH_ALIAS+":"+GSTUDIO_ELASTIC_SEARCH_PORT,timeout=100, retry_on_timeout=True)


# author_index = "author_" + GSTUDIO_SITE_NAME.lower()
# index = GSTUDIO_SITE_NAME.lower()
# gsystemtype_index = "node_type_" + GSTUDIO_SITE_NAME.lower()

# page_id = 0

# def index_docs(all_docs):
# k = 0
# all_docs_count = all_docs.count()
# for node in all_docs:
# print "[ %s/%s ] : %s " % (k, all_docs_count, node._id)
# if(node._type == "GSystem"):
# try:
# node.get_neighbourhood(node.member_of)
# except Exception as e:
# print(e)
# else:
# pass

# doc = json.dumps(node, cls=NodeJSONEncoder) #convert mongoDB object to a JSON string
# #doc = json.loads(doc,object_hook=json_util.object_hook) ->get back mongoDB object from JSON string

# document = json.loads(doc) #convert JSON string to a python dictionary
# #doc = json.dumps(document) #convert python dictionary to JSON string

# if("name" in document.keys()):

# # replacing "_" starting keys:
# document["id"] = document.pop("_id")
# document["type"] = document.pop("_type")

# if("object_type" in document.keys()):
# document["object_type"] = str(document["object_type"])
# if("property_order" in document.keys()):
# document["property_order"] = str(document["property_order"])
# if("object_value" in document.keys()):
# document["object_value"] = str(document["object_value"]) #for consistent mapping

# doc_type = get_document_type(document)
# es.index(index=index, doc_type=doc_type, id=document["id"], body=document)
# if "contributors" in document.keys():
# contributors = document["contributors"]
# for contributor_id in contributors:
# es.index(index = author_index, doc_type = contributor_id, id=document["id"], body = document)

# if(document["type"] == "GSystem"):
# for type_ids in document['member_of']:
# es.index(index = gsystemtype_index, doc_type = type_ids, id = document["id"], body = document)

# k+=1

# def get_document_type(document):
# types_arr = ["Author", "GAttribute", "GRelation", "AttributeType", "Filehive", "RelationType", "Group", "GSystemType"]
# if document["type"]=="GSystem":
# for ids in document['member_of']: #document is a member of the Page GSystemType
# if(ids == page_id):
# return "Page"
# if('if_file' in document.keys()):
# if(document["if_file"]["mime_type"] is not None):
# data = document["if_file"]["mime_type"].split("/")
# doc_type = data[0]
# else:
# doc_type = "NotMedia"
# else:
# doc_type = "NotMedia"
# elif (document["type"] in types_arr):
# doc_type = document["type"]
# else:
# doc_type = "DontCare"
# return doc_type


# def main():

# print("Starting the indexing process...")
# # DELETING existing/old indexes
# if(es.indices.exists(index)):
# print("Deleting the existing index: "+index+" for reindexing")
# res = es.indices.delete(index=index)
# print("The delete response is %s " % res)

# if(es.indices.exists(author_index)):
# print("Deleting the existing author_index: "+author_index +" for reindexing")
# res = es.indices.delete(index=author_index)
# print("The delete response is %s " % res)

# if(es.indices.exists(gsystemtype_index)):
# print("Deleting the existing gtype index: "+ index+ "for reindexing")
# res = es.indices.delete(index=gsystemtype_index)
# # --- END of DELETING existing/old indexes

# with open("/home/docker/code/gstudio/gnowsys-ndf/gnowsys_ndf/req_body.json") as req_body:
# request_body = json.load(req_body)
# with open("/home/docker/code/gstudio/gnowsys-ndf/gnowsys_ndf/req_body_gtype.json") as req_body_type:
# request_body_gtype = json.load(req_body_type)
# with open(GSTUDIO_DOCUMENT_MAPPING+"/gsystemtype_map.json") as gtypemap:
# gtype_map = json.load(gtypemap)
# page_id = gtype_map["Page"]

# res = es.indices.create(index=index, body=request_body)
# print("Response for index creation")
# print(res)

# res = es.indices.create(index=gsystemtype_index, body=request_body_gtype)
# print("Response for index creation")
# print(res)

# res = es.indices.create(index=author_index, body=request_body_gtype)
# print("Response for index creation")
# print(res)

# all_docs = node_collection.find(no_cursor_timeout=True).batch_size(5)
# index_docs(all_docs)

# main()
204 changes: 204 additions & 0 deletions doc/deployer/es_injection.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
from bson import json_util
import os
import sys
import json
from elasticsearch import Elasticsearch
from gnowsys_ndf.ndf.models import *

#from gnowsys_ndf.settings import GSTUDIO_SITE_NAME
#from gnowsys_ndf.local_settings import GSTUDIO_DOCUMENT_MAPPING
from gnowsys_ndf.settings import *

try:
from bson import ObjectId
except ImportError: # old pymongo
from pymongo.objectid import ObjectId
##### use the below commented lines if you are working with Python 2.x #####
# reload(sys)
# sys.setdefaultencoding('UTF8')

es = Elasticsearch(GSTUDIO_ELASTIC_SEARCH_PROTOCOL+"://"+GSTUDIO_ELASTIC_SEARCH_SUPERUSER+":"+GSTUDIO_ELASTIC_SEARCH_SUPERUSER_PASSWORD+"@"+GSTUDIO_ELASTIC_SEARCH_ALIAS+":"+GSTUDIO_ELASTIC_SEARCH_PORT,timeout=100, retry_on_timeout=True)

#author_index = "author_" + GSTUDIO_SITE_NAME.lower()
#index = GSTUDIO_SITE_NAME.lower()
#gsystemtype_index = "node_type_" + GSTUDIO_SITE_NAME.lower()
with open("/home/docker/code/gstudio/gnowsys-ndf/gnowsys_ndf/gstudio_configs/req_body.json") as req_body:
request_body = json.load(req_body)
with open("/home/docker/code/gstudio/gnowsys-ndf/gnowsys_ndf/gstudio_configs/triples.json") as triples:
triples_body = json.load(triples)


page_id = 0


def index_docs(all_docs,index,doc_type):
k = 0
all_docs_count = all_docs.count()
for docs in all_docs:
print "[ %s/%s ] : %s " % (k, all_docs_count, docs._id)


doc = json.dumps(docs, cls=NodeJSONEncoder) # convert mongoDB object to a JSON string
# doc = json.loads(doc,object_hook=json_util.object_hook) ->get back mongoDB object from JSON string

document = json.loads(doc) # convert JSON string to a python dictionary
# doc = json.dumps(document) #convert python dictionary to JSON string
document["id"] = document.pop("_id")
document["type"] = document.pop("_type")

#for docs in doc_type:
print document["type"]
#print document
doc_type = document["type"].lower()
es.index(index=index, doc_type=doc_type, id=document["id"], body=document)

k += 1

#file_name.close()



def get_document_type(document):

if document["type"]=="GSystem":
#for ids in document['member_of']: #document is a member of the Page GSystemType
#if(ids == page_id):
#return "Page"
if('if_file' in document.keys()):
if(document["if_file"]["mime_type"] is not None):
data = document["if_file"]["mime_type"].split("/")
doc_type = data[0]
else:
doc_type = "notmedia"
else:
doc_type = "notmedia"

else:
doc_type = "dontcare"
return doc_type



def main():
#f = open("/data/nodes.txt", "w")
#os.chmod("/data/nodes.txt", 0o777)

nodes = {}
triples = {}
benchmarks = {}
filehives = {}
buddys = {}
counters = {}

#all_docs = [ triples, buddys, benchmarks, nodes, counters]

print("Starting the indexing process...")

for index, doc_type in GSTUDIO_ELASTIC_SEARCH_INDEX.items():
temp = []


index_lower = index.lower()
if (not es.indices.exists(index_lower)):
if (index_lower == "triples"):
res = es.indices.create(index=index_lower, body=triples_body)
else:
res = es.indices.create(index=index_lower, body=request_body)

if (es.indices.exists(index_lower)):

res = es.search(index=index_lower, body={"query": {"match_all": {}}, "_source": ["id"]}, scroll="1m", size="10")

scrollid = res['_scroll_id']

while len(res['hits']['hits']) > 0:

for hit in res['hits']['hits']:
# print(hit["_source"]["id"])
# f.write(hit["_source"]["id"] + '\n')
# res = es.search(index="nodes", body={"scroll_id": '"' + scrollid + '"'}, search_type="scan",
# scroll="1m", size="10")
temp.append(ObjectId(hit["_source"]["id"]))

res = es.scroll(scrollid, scroll="1m")


if(index_lower == "nodes"):
nodes = node_collection.find({ '_id': {'$nin': temp} }).batch_size(5)

if(nodes.count() == 0):
print("All "+ index_lower +" documents has injected to elasticsearch")
continue
else:
index_docs(nodes, index_lower, doc_type)

elif (index_lower == "triples"):
triples = triple_collection.find({ '_id': {'$nin': temp} }).batch_size(5)
if (triples.count() == 0):
print("All " + index_lower + " documents has injected to elasticsearch")
continue
else:
# f = open("/data/triples.txt", "w")
# os.chmod("/data/triples.txt", 0o777)
index_docs(triples, index_lower, doc_type)

elif (index_lower == "benchmarks"):
benchmarks = benchmark_collection.find({ '_id': {'$nin': temp} }).batch_size(5)
if (benchmarks.count() == 0):
print("All " + index_lower + " documents has injected to elasticsearch")
continue
else:
index_docs(benchmarks, index_lower, doc_type)

elif (index_lower == "filehives"):
filehives = filehive_collection.find({ '_id': {'$nin': temp} }).batch_size(5)
if (filehives.count() == 0):
print("All " + index_lower + " documents has injected to elasticsearch")
continue
else:
index_docs(filehives, index_lower, doc_type)

elif (index_lower == "buddies"):
buddys = buddy_collection.find({ '_id': {'$nin': temp} }).batch_size(5)
if (buddys.count() == 0):
print("All " + index_lower + " documents has injected to elasticsearch")
continue
else:
index_docs(buddys, index_lower, doc_type)

elif (index_lower == "counters"):
counters = counter_collection.find({ '_id': {'$nin': temp} }).batch_size(5)
if (counters.count() == 0):
print("All " + index_lower + " documents has injected to elasticsearch")
continue
else:
index_docs(counters, index_lower, doc_type)


#print(res['_scroll_id'])
#print(res['hits']['total'])

#f = open("/data/nodes.txt", "w+")
#os.chmod("/data/nodes.txt", 0o777)

# f = open("/data/nodes.txt", "w+")
# os.chmod("/data/nodes.txt", 0o777)

# es.scroll(scrollid, scroll="1m")

#print(temp)

# DELETING existing/old indexes

# for index in GSTUDIO_ELASTIC_SEARCH_INDEX.keys():
# if (es.indices.exists(index_lower)):
# print("Deleting the existing index: " + index.lower() + " for reindexing")
# res = es.indices.delete(index=index.lower())
# print("The delete response is %s " % res)


# --- END of DELETING existing/old indexes



main()
Loading