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

Contributor's name is added in the card #1928

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

Contributor's name is added in the card #1928

wants to merge 459 commits into from

Conversation

amitmoralwar
Copy link

When user created a file in asset collection then name of user is appearing on the card.

siddhudhangar and others added 30 commits March 30, 2018 15:35
@siddhudhangar
search box moved to top header
648102d
@siddhudhangar
added search box on top header
5201db1
@siddhudhangar
search_views file changed...modified search query
dc1851f
@siddhudhangar
changes in simple_card.html file .... now displayed default images...
7fc80bc
@siddhudhangar
interactives default image issue resolved
cca2dc2
@siddhudhangar
merge nro
aaad402
@siddhudhangar
advanced search view,url,template created
dbaa1d9
@siddhudhangar
Merge branch 'beta' of https://github.com/gnowledge/gstudio into es-g…
9f0d66d 
…studio-api
Interaction setting-discuss in top right has same UI as discuss in bo…
d49fbd0 
…ttom
@siddhudhangar
contextual search for repository page and e-library page.... but in e…
ee88984 
…-library some issue found....
@tirthakarmahesh211
Home page redesigning as per mock up
58bf85c
@siddhudhangar
added radio button for search box...and working fine...
ac9e365
@tirthakarmahesh211
horizontal scroll problemunder workspace fixed
4960655
@siddhudhangar
contextual search for course created....
12ef595
@siddhudhangar
contextual search for workspaces created....
401caf0
@siddhudhangar
name and altnames field added on mongo query for search in explore vi…
f183923 
…ew for course and workspace
@siddhudhangar
name and altnames field added on mongo query for search in explore vi…
2d2ae21 
…ew for drafts
@siddhudhangar
name and altnames field added on mongo query for search in user dashb…
b0d1dfb 
…oard view for my-desk
@siddhudhangar
In header.html file ... added url for e-library for search
9fe9de1
@siddhudhangar
userDashboard view added .... mongo query for case insensitive search
da81f16
@siddhudhangar
course and workspace mongo query modified
f523f7c
@siddhudhangar
search query for theme page
4729230
secondary header removed from activity page
79cae20
@siddhudhangar
e-library search for local and global
356ba0a
@tirthakarmahesh211
Alt language option appear first problem fixed
76331dd
@siddhudhangar
In header template, fixed global radio button for other pages
c0d0683
Explore button to remain in desk always
1d3bd13
@siddhudhangar
In Institutional Partners module added search functionality
606e5b1
@tirthakarmahesh211
about us blog size reduced
83237a9
@siddhudhangar
In State Partners module added contextual search functionality
abf4040
amitmoralwar and others added 29 commits April 19, 2018 20:06
cross-publish from personal workspace to desk issue is resolved
3049262
@siddhudhangar
In simple card,if else block added for mongo and es to displayed thum…
345bc21 
…bnail and e-library view modified for files and pages show
@siddhudhangar
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
2f44c00 
…udio into es-gstudio-api
@siddhudhangar
Merge pull request gnowledge#19 from tirthakarmahesh211/beta-release11
2be5682 
esBeta release11
@siddhudhangar
Merge pull request gnowledge#20 from amitmoralwar/cross-publish-new
56e83b5 
cross-publish from personal workspace to desk issue is resolved
@siddhudhangar
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
1d4ac1f 
…udio into es-gstudio-api
@siddhudhangar
misc changes
7f1d4c2
@siddhudhangar
In e-libary view changed for show jsmol also
ed0cb37
@siddhudhangar
misc changes
a0e7d7a
@tirthakarmahesh211
In filter Malayalam and aasamese lang added and Module name renamed a…
70db559 
…s Name
@siddhudhangar
Merge pull request gnowledge#21 from tirthakarmahesh211/beta-release11
d87966e 
In filter Malayalam and aasamese lang added and Module name renamed a…
@siddhudhangar
Merge branch 'beta' of https://github.com/gnowledge/gstudio into es-g…
34d250d 
…studio-api

Conflicts:
	gnowsys-ndf/gnowsys_ndf/ndf/templates/ndf/main_simple_card.html
@siddhudhangar
In rating.html file changed,rating issue fixed
ba16d5a
@siddhudhangar
in-line-texteditor.html file changed,added funtion to show alert mess…
ccd645d 
…age for non-login users
@siddhudhangar
check_user_access_policy changed and user.is_authenticated changed in…
d113e3e 
… rating.html
@siddhudhangar
In widget_user_search.html,replaced text Find Students to Find Members
f3943ef
@siddhudhangar
In lms.html file chenge,for show gallery text on tab except home work…
813e7b5 
…space
@katkamrachana
Merge branch 'es-gstudio-api' of https://github.com/siddhudhangar/gst…
50267f5 
…udio into 23april-oauth
@katkamrachana
Login code with updated changes required for beta merge
9bfbd2d
Miscellenous changes
fac8049
@siddhudhangar
in-line-texteditor.html file changed,added js funtion to show alert m…
094e14b 
…essage for non-login users when user click on comment button
@siddhudhangar
In rating.html file changed,added input type hidden field for csrf_to…
06ed35c 
…ken,group_id,is_authenticated.rating issue resolved
@siddhudhangar
In lms.html file changed,showing 'gallery' text on all workspaces tab…
d6ebc50 
… except home workspace
@siddhudhangar
In widget_user_search.html,replaced text Find Students to Find Members
05e716e
Merge branch '23april-oauth' of https://github.com/amitmoralwar/gstudio…
bee1954 
… into card-list
@siddhudhangar
In method.py file,group_obj argument of user_access_policy() funtion …
081509a 
…replaced to group_obj._id argument
@siddhudhangar
In in-line-texteditor.html file, whole file replaced with master code…
a169c8f 
… from gnowledge
merge unmerge files
6ab3526
Flash a message if user entered wrong credentials but changes required
ae22889
@katkamrachana
Copy link
Member

seems like this PR is from an unintentional branch. @amitmoralwar I suggest you have a review once and if it has to go to beta or not. (please change pull-request title if the commits do more than what is specified)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@amitmoralwar @katkamrachana @siddhudhangar @tirthakarmahesh211