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

Authoring tab , Create collection button, More info button added #1978

Open
wants to merge 1,055 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1055 commits
Select commit Hold shift + click to select a range
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
39438fd
In create activity page,added 'Mark as H5P Page' checkbox option ,STs…
siddhudhangar Apr 20, 2018
42fc4c7
Merge pull request #1951 from siddhudhangar/nroer_beta
katkamrachana Apr 20, 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
0865c1d
Merge branch 'beta' of https://github.com/gnowledge/gstudio into beta
katkamrachana Apr 22, 2018
d98a321
program event queries modified
katkamrachana Apr 22, 2018
27dde8d
update query based on gstaff users
katkamrachana Apr 22, 2018
1fe4756
Merge pull request #1952 from katkamrachana/beta
katkamrachana 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
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
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
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
c454f94
Download as webm and mp4
May 10, 2018
36aefaf
Merge branch 'new-changes' of https://github.com/amitmoralwar/gstudio…
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
b0cd8f3
New cards added for popular things
tirthakarmahesh211 May 23, 2018
19ba5ee
changes in new card resizing
tirthakarmahesh211 May 24, 2018
4de1b68
In upload_file.html, comment tag added for autocompletion js
siddhudhangar May 28, 2018
855bccd
In home.py, mongo query replaced with ES code
siddhudhangar May 28, 2018
d9a10ea
Conflicts Resolved
May 31, 2018
61863a0
Merge pull request #37 from amitmoralwar/stormborn
siddhudhangar May 31, 2018
4645601
In ajax_views.py, user_views and total_views code replaced with ES code
siddhudhangar Jun 4, 2018
cf19cf9
lms secondary css issue fixed for others workspace
tirthakarmahesh211 Jun 5, 2018
fcd1b4a
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 5, 2018
d7b512f
Merge pull request #38 from tirthakarmahesh211/beta-maychanges
siddhudhangar Jun 5, 2018
274109a
lms dashborad menu css fixed and Edit sturecture commented
tirthakarmahesh211 Jun 5, 2018
7afd95f
font family issue solved
tirthakarmahesh211 Jun 5, 2018
9a505ac
Merge pull request #39 from tirthakarmahesh211/beta-maychanges
siddhudhangar Jun 5, 2018
9783437
In group.py, cross_publish method changed.target_group_ids =list(set(…
siddhudhangar Jun 5, 2018
d77e9cc
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 5, 2018
4d62261
In my-desk view,replaced mongo query with ES query and added pagination
siddhudhangar Jun 13, 2018
2274b8d
In node and filehive model file,if conditon added to check NONE value…
siddhudhangar Jun 13, 2018
84e72b6
Unbound local variable error throwed,so importing mongokit paginator …
siddhudhangar Jun 13, 2018
0fdd472
New Branch created and adding mastodon login code
Jun 14, 2018
25184e4
chnages in authoring menu and changes in metadata infobox
tirthakarmahesh211 Jun 14, 2018
cac8c5b
In module_detail.html file changed, for displaying some partner card …
siddhudhangar Jun 14, 2018
f6b01fc
In ajax_views.py,comment import mapper
siddhudhangar Jun 14, 2018
67d3b92
File Upload sucess message removed,download button code revert to old…
Jun 14, 2018
2e0fc89
In e-library, removed all files,only displayed resources that have a …
siddhudhangar Jun 14, 2018
9de9eea
Merge pull request #41 from amitmoralwar/misc-dev
siddhudhangar Jun 14, 2018
b4dab80
Authoring tab added for desk
tirthakarmahesh211 Jun 14, 2018
ad2d120
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 14, 2018
4260094
In e-library, removed all files,only displayed resources that have a …
siddhudhangar Jun 14, 2018
19a69b4
chnages in authoring menu and changes in metadata infobox
tirthakarmahesh211 Jun 14, 2018
3a9610a
added toggle functionality to 'mark as a interactive page' checkbox
siddhudhangar Jun 14, 2018
b89f250
title field removed from create collection button
tirthakarmahesh211 Jun 14, 2018
1696a0b
Merge pull request #42 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jun 14, 2018
7e048a5
for create collection through ajax,we added es code in simple_card.html
siddhudhangar Jun 15, 2018
e766cb2
In asset_card.html,In if conditon, group_object.edit_policy removed t…
siddhudhangar Jun 17, 2018
b919efd
In card_group.html file, if conditon added for ES
siddhudhangar Jun 17, 2018
7f4febb
Profile Visibility Issue Resolved
Jun 19, 2018
ca7a015
Profile Pic Uploading Issue Resolved
Jun 19, 2018
a04cee2
Thumbnail of profile pic and elibrary content issue is resolved
Jun 19, 2018
fdb9b51
Merge pull request #43 from amitmoralwar/misc-dev
siddhudhangar Jun 19, 2018
0813882
nos of lessons and students count are added on cards
tirthakarmahesh211 Jun 20, 2018
9391f5a
In e-library view, added page id in member_of list for ES and 'Mark a…
siddhudhangar Jun 21, 2018
cf1dc3e
In e-libary,query modified for ebook and document
siddhudhangar Jun 26, 2018
e167dba
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jun 27, 2018
50f16fa
Link add related file css fixed
tirthakarmahesh211 Jun 27, 2018
bf4bd54
In e-libary,query modified for removed png,jpeg images
siddhudhangar Jun 27, 2018
cafce22
Edit Structure moved to Authoring tab
tirthakarmahesh211 Jun 27, 2018
02179f3
Code replaced due to git crash
Jun 27, 2018
cf961cb
Conflicts Resolved
Jun 27, 2018
d927262
nos of student keyword on card is replaced with member keyword
tirthakarmahesh211 Jun 27, 2018
914accb
Card Title fixed
tirthakarmahesh211 Jun 27, 2018
fce7b72
Feedback Button Addition in Activity Player,Blog and Asset Collection
Jun 27, 2018
114cdbc
Conflict Resolved
Jun 27, 2018
c50227e
Merge pull request #46 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jun 27, 2018
d67a8d2
Merge pull request #47 from amitmoralwar/es-gstudio-api
siddhudhangar Jun 27, 2018
552a4c2
gstudio link on footer linked to gitlab
tirthakarmahesh211 Jun 27, 2018
822f52a
In gcourse view,assets method code replaced with master code
siddhudhangar Jun 27, 2018
f2bde3d
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 27, 2018
462c894
Merge pull request #48 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jun 27, 2018
e7c74e2
edit button on card commented
tirthakarmahesh211 Jun 28, 2018
90bea83
partner cards , my desk card and enrolled courses card, we added edit…
siddhudhangar Jun 28, 2018
b9c67c3
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 28, 2018
adb91f1
In card_group.html, added if condition for 'PartnerGroup' to show thu…
siddhudhangar Jun 29, 2018
e06d176
In card_group.html, added if condition for 'PartnerGroup' to show thu…
siddhudhangar Jun 29, 2018
59ca520
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jun 29, 2018
2c6198a
Change Image for my-desk,'has_profile_pic relation used to displayed …
siddhudhangar Jun 29, 2018
55505a3
Some misc changes
siddhudhangar Jun 29, 2018
9f392bd
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jun 29, 2018
2b2cc25
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jun 29, 2018
26a068b
some code changes in search view, so that user able to search resourc…
siddhudhangar Jun 29, 2018
ffe229a
Edit button added on card to change the profile info and E-libray lin…
tirthakarmahesh211 Jun 29, 2018
6679ded
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jun 29, 2018
897d62b
Edit button css changed
tirthakarmahesh211 Jun 29, 2018
7f07ea4
Merge pull request #49 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jun 29, 2018
61a9640
in card_group hrml file added conditon for for displayed lesson or se…
siddhudhangar Jun 29, 2018
3571035
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 29, 2018
786cc1f
Licence field updated
tirthakarmahesh211 Jun 29, 2018
1fa6535
Cc by sa link ed to cc by sa url
tirthakarmahesh211 Jun 29, 2018
1d3a295
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jun 29, 2018
2e24ad5
Merge pull request #50 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jun 29, 2018
a8776ad
some code changes in search view
siddhudhangar Jun 29, 2018
93ead57
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jun 29, 2018
8164368
some code changes in search view, so that user able to search resourc…
siddhudhangar Jun 29, 2018
d84a15b
in search view, multimatch filter added in should es query
siddhudhangar Jun 29, 2018
cf46304
In e-libary and ebook view,added sort function in search query
siddhudhangar Jul 1, 2018
19299ae
kedar master code merge into three files
siddhudhangar Jul 2, 2018
38c36a1
kedar master code merge into two files like methods.py and api_v1.py …
siddhudhangar Jul 6, 2018
ec40fc2
celery functionality enabled in gstudio... only nodes , triples and b…
siddhudhangar Jul 12, 2018
bbce83a
If history_manager.py file,create_or_replace_json_file code changed
siddhudhangar Jul 12, 2018
d7e5efa
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jul 13, 2018
ddf0b43
counter.py model added *args argument in rcs_function()
siddhudhangar Jul 13, 2018
f5e9858
Responsive footer added and interactives height issue fixed
tirthakarmahesh211 Jul 13, 2018
59f2294
Merge pull request #51 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jul 13, 2018
2cf1fc9
landing page cards font size issue solved
tirthakarmahesh211 Jul 13, 2018
f2ef619
filehive.py model added *args argument in rcs_function()
siddhudhangar Jul 13, 2018
339bc89
landing page cards position problem fixed
tirthakarmahesh211 Jul 13, 2018
a4523d5
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
siddhudhangar Jul 13, 2018
d7b95cd
Login template made responsive
tirthakarmahesh211 Jul 13, 2018
d811769
Add asset template fixed for responsive
tirthakarmahesh211 Jul 16, 2018
4fbf0d2
Course_page create and course edit fixed as responsive
tirthakarmahesh211 Jul 16, 2018
65e7850
unwanted list tab removed from header
tirthakarmahesh211 Jul 16, 2018
6a8f60e
In ndf_tags file,for displayed e-libary to personal workspace,changed…
siddhudhangar Jul 17, 2018
fd3d234
Cross Publish Text added in Actions dropdown
tirthakarmahesh211 Jul 17, 2018
3efab86
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
tirthakarmahesh211 Jul 17, 2018
69bebb5
License field removed from LMS PAge
tirthakarmahesh211 Jul 17, 2018
8aee0e7
License field kept for each resource
tirthakarmahesh211 Jul 17, 2018
cd66131
Merge pull request #52 from tirthakarmahesh211/beta-cgchanges
siddhudhangar Jul 18, 2018
405135f
New activity player partial code added
tirthakarmahesh211 Jul 24, 2018
9a55d7a
activity content added
tirthakarmahesh211 Jul 25, 2018
62bbb65
when we click on lesson, it will be displayed in same page with ajax …
siddhudhangar Jul 25, 2018
9ea56ab
when we click on lesson, it will be displayed in same page with ajax …
siddhudhangar Jul 25, 2018
21ce980
code added for tree itself content
tirthakarmahesh211 Jul 26, 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