From ff316f7bddee91432767c2ba1ab5d573d2270bd6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 3 May 2016 16:33:06 +0200 Subject: [PATCH 01/70] updated changes log --- CHANGELOG.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e69ec1563..01d37ccc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,17 @@ # Changelog Fab Manager -## v2.1.0 2016 mai 2 +## v2.1.1 2016 May 3 +- Fix a bug concerning openlab projects initialization in production env +- Fix a bug: user is not redirected after changing is duplicated e-mail on the SSO provider + +## v2.1.0 2016 May 2 - Add search feature on openlab projects : [Openlab-projects](https://github.com/LaCasemate/openlab-projects) - Add integration tests for main features -- Credits logic has been extracted into microservice -- Improuve UI list of projects +- Credits logic has been extracted into a microservice +- Improved UI list of projects - Refactor interface for SSO profile completion - Change interface for SSO/email already used -- Fix bug custom asset favicon-file favicon file is not set \ No newline at end of file +- Fix a bug: custom asset favicon-file favicon file is not set +- Fix a security issue: stripe card token is now checked on server side on new/renew subscription +- Translated notification e-mails into english language +- Subscription extension logic has been extracted into a microservice \ No newline at end of file From c499771433ecaa8dbe5aa7a03b5a1bed840efb67 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 12 May 2016 13:53:59 +0200 Subject: [PATCH 02/70] migrate profile edit to 'my parameters' tab and add public profile in dashboard --- .../javascripts/controllers/members.coffee | 4 +- app/assets/javascripts/router.coffee.erb | 12 +- app/assets/templates/dashboard/nav.html.erb | 1 + .../templates/dashboard/profile.html.erb | 127 ++---------------- .../templates/dashboard/settings.html.erb | 125 +++++++++++++++++ app/assets/templates/members/show.html.erb | 94 +------------ app/assets/templates/shared/header.html.erb | 1 + app/assets/templates/shared/leftnav.html.erb | 9 +- .../templates/shared/publicProfile.html.erb | 91 +++++++++++++ config/locales/app.logged.en.yml | 5 +- config/locales/app.logged.fr.yml | 5 +- config/locales/app.public.en.yml | 1 + config/locales/app.public.fr.yml | 1 + 13 files changed, 258 insertions(+), 218 deletions(-) create mode 100644 app/assets/templates/dashboard/settings.html.erb create mode 100644 app/assets/templates/shared/publicProfile.html.erb diff --git a/app/assets/javascripts/controllers/members.coffee b/app/assets/javascripts/controllers/members.coffee index f778f13f8..c1b25bf7a 100644 --- a/app/assets/javascripts/controllers/members.coffee +++ b/app/assets/javascripts/controllers/members.coffee @@ -211,8 +211,8 @@ Application.Controllers.controller "EditProfileController", ["$scope", "$rootSco ## # Controller used on the public user's profile page (seeing another user's profile) ## -Application.Controllers.controller "ShowProfileController", ["$scope", "$stateParams", 'Member', 'memberPromise', ($scope, $stateParams, Member, memberPromise) -> +Application.Controllers.controller "ShowProfileController", ["$scope", 'memberPromise', ($scope, memberPromise) -> - ## Selected user's profile (id from the current URL) + ## Selected user's informations $scope.user = memberPromise ] diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index ed28c6779..5285a2975 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -136,6 +136,16 @@ angular.module('application.router', ['ui.router']). views: 'main@': templateUrl: '<%= asset_path "dashboard/profile.html" %>' + controller: 'DashboardController' + resolve: + translations: [ 'Translations', (Translations) -> + Translations.query(['app.logged.dashboard.profile']).$promise + ] + .state 'app.logged.dashboard.settings', + url: '/settings' + views: + 'main@': + templateUrl: '<%= asset_path "dashboard/settings.html" %>' controller: 'EditProfileController' resolve: groups: ['Group', (Group)-> @@ -145,7 +155,7 @@ angular.module('application.router', ['ui.router']). AuthProvider.active().$promise ] translations: [ 'Translations', (Translations) -> - Translations.query(['app.logged.dashboard.profile', 'app.shared.user']).$promise + Translations.query(['app.logged.dashboard.settings', 'app.shared.user']).$promise ] .state 'app.logged.dashboard.projects', url: '/projects' diff --git a/app/assets/templates/dashboard/nav.html.erb b/app/assets/templates/dashboard/nav.html.erb index 0c4d5f34e..ee0c398c0 100644 --- a/app/assets/templates/dashboard/nav.html.erb +++ b/app/assets/templates/dashboard/nav.html.erb @@ -11,6 +11,7 @@

{{ 'dashboard' }}