branch develop updated (90e32a4 -> 38b7715)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 90e32a4 fixes #7914 filtered already added documents and parents in project modification new 38b7715 add a way for admin to see delteed projects The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 38b7715d932d28bb711d8d191f152ddaa20bc877 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 21 11:32:20 2016 +0100 add a way for admin to see delteed projects Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/questions/toolsPart.html | 1 + 3 files changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 38b7715d932d28bb711d8d191f152ddaa20bc877 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 21 11:32:20 2016 +0100 add a way for admin to see delteed projects --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/questions/toolsPart.html | 1 + 3 files changed, 3 insertions(+) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index b1a37b1..45f7a3b 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -342,6 +342,7 @@ var translateEN = { "IN_PROGRESS" : "In progress", "CLOSED" : "Closed", "ADJOURNED" : "Adjourned", +"DELETED" : "Deleted", "home.presentation.title" : "<h1>Welcome to Coselmar Platform</h1>", "home.presentation.body" : "<p>This knowledge platform is intended to centralize the knowledge produced and exploited in the Coselmar project.</p>\ diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index beb7166..aaef867 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -342,6 +342,7 @@ var translateFR = { "IN_PROGRESS" : "En cours", "CLOSED" : "Fermé", "ADJOURNED" : "Ajourné", +"DELETED" : "Supprimé", "home.presentation.title" : "<h1>Bienvenue sur la plateforme de Coselmar</h1>", "home.presentation.body" : "<p>Cette plateforme de connaissance a pour but de centraliser la connaissance exploitée et produite dans le cadre du projet Coselmar.</p>\ diff --git a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html index 4f6e03d..3e6f317 100644 --- a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html @@ -92,6 +92,7 @@ <option value="IN_PROGRESS">{{ 'IN_PROGRESS' | translate }}</option> <option value="CLOSED">{{ 'CLOSED' | translate }}</option> <option value="ADJOURNED">{{ 'ADJOURNED' | translate }}</option> + <option value="DELETED" ng-if="context.currentUser.role == 'ADMIN'">{{ 'DELETED' | translate }}</option> </select> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm