1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Commit Graph

238 Commits

Author SHA1 Message Date
Sylvain
7f050223eb Merge branch 'hotfix' into dev
Conflicts:
	CHANGELOG.md
2016-05-24 14:59:07 +02:00
Sylvain
f056c1eb91 updated changelog for 2.1.2 2016-05-24 14:56:58 +02:00
Sylvain
139d7d9f0f [bug] Google Analytics not loaded
- angular-google-analytics plugin update from 0.0.15 to 1.1.7
- google analytics config moved into secrets.yml/production
2016-05-24 14:53:07 +02:00
Sylvain
cab70654d6 updated change log 2016-05-18 17:33:42 +02:00
Sylvain
7c870cd079 Merge branch 'profile' into dev 2016-05-18 17:30:55 +02:00
Sylvain
cbaf1d8610 updated change log 2016-05-18 17:30:33 +02:00
Sylvain
b19765ad4a change placeholders for social networks + remove contributor status label top margin 2016-05-18 17:21:10 +02:00
Sylvain
1a8d2db53c [feature][UI][profile banner] set default picture 2016-05-18 16:53:10 +02:00
Sylvain
a66b314e7b [feature] background picture of profile banner customization 2016-05-18 16:15:54 +02:00
Sylvain
420d247590 adjust avatar position & bio titles 2016-05-18 14:28:44 +02:00
Sylvain
d8cc1ec107 fix responsive public profile 2016-05-18 11:16:55 +02:00
Sylvain
1869dd0bcf [bug] project gain collaborator i18n key FR
[UI] project display in profile
2016-05-18 10:54:50 +02:00
Sylvain
a3e0954f93 fix profile pictos style 2016-05-18 10:11:50 +02:00
Sylvain
9ee869ee3f fix regex pattern 2016-05-18 09:47:30 +02:00
Sylvain
c1c981a695 social links validation 2016-05-18 09:38:55 +02:00
Sylvain
d005712662 fix social links position & website icon 2016-05-18 09:11:08 +02:00
Sylvain
196f1be6a3 fix missing i18n import 2016-05-18 08:50:55 +02:00
Sylvain
284879e0d4 private profile 2016-05-17 17:43:29 +02:00
Sylvain
0061c3dca6 reorganize profile header zone 2016-05-17 16:41:32 +02:00
Sylvain
93edd6eaa8 [ongoing] UI refactoring of public profile 2016-05-16 18:20:22 +02:00
Sylvain
88de9c3c75 [feature] profile website + edition of is_allow_contact 2016-05-16 14:46:57 +02:00
Sylvain
a430c0cef7 updated echosciences logo 2016-05-16 13:39:16 +02:00
Sylvain
ca3cd278a4 i18n social networks 2016-05-16 11:30:03 +02:00
Sylvain
6b66620686 improve social button workflow 2016-05-16 11:23:19 +02:00
Sylvain
7ec5e5ba03 [feature] allow user to add links to his socials networks 2016-05-16 11:18:30 +02:00
Sylvain
a5dd2153d6 move i18n public profile 2016-05-12 15:46:18 +02:00
Sylvain
c499771433 migrate profile edit to 'my parameters' tab and add public profile in dashboard 2016-05-12 13:53:59 +02:00
Sylvain
dc5c125cdb updated changes log 2016-05-03 16:39:05 +02:00
Sylvain
ff316f7bdd updated changes log 2016-05-03 16:33:06 +02:00
Nicolas Florentin
8187c11b34 Merge branch 'dev' 2016-05-03 11:32:05 +02:00
Nicolas Florentin
726593c2f7 fix typo readme 2016-05-03 11:29:38 +02:00
Nicolas Florentin
806d9df331 fix typo readme 2016-05-03 11:29:14 +02:00
Nicolas Florentin
434107646d update readme: open projects 2016-05-03 11:27:01 +02:00
cyril
0859e42db7 Merge branch 'dev' 2016-05-03 09:41:26 +02:00
Sylvain
82a9980c20 [bug] is not defined after sso profile sync 2016-05-03 09:37:15 +02:00
cyril
ad510af829 fix initializers openlab_ruby for env dev 2016-05-02 20:00:39 +02:00
cyril
d0ff7b7a21 Merge branch 'dev' 2016-05-02 18:36:29 +02:00
Nicolas Florentin
30105e5af4 fix, openlab_ruby initializer was erasing base_uri 2016-05-02 18:35:59 +02:00
cyril
b059271dd9 Merge branch 'dev' 2016-05-02 18:15:52 +02:00
Nicolas Florentin
b6918f824c update openlab_ruby 2016-05-02 18:13:21 +02:00
cyril
8864863343 Merge branch 'release-2.1.0' 2016-05-02 17:15:50 +02:00
cyril
ce6979729a add changelog file 2016-05-02 17:14:21 +02:00
cyril
65c19b3462 fix translate 2016-05-02 17:14:01 +02:00
cyril
c271d50991 Merge branch 'projects-openfablab' into dev 2016-05-02 16:56:31 +02:00
cyril
f84e633f7c Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab 2016-05-02 16:21:26 +02:00
cyril
31d5fbbb15 fix ui projects list 2016-05-02 16:21:23 +02:00
Nicolas Florentin
d29deaad51 projects/index now save in url query param if whole_network is true 2016-05-02 16:18:24 +02:00
cyril
12bc556038 Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab 2016-05-02 16:10:54 +02:00
cyril
7288834417 ui projects list 2016-05-02 16:10:48 +02:00
Nicolas Florentin
4afb968750 fix select option for machines themes and materials when you get back to page and want your history back 2016-05-02 12:48:26 +02:00