1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Commit Graph

859 Commits

Author SHA1 Message Date
Peng DU
4d0d3d6af0 optimise load plans json 2016-06-21 14:49:39 +02:00
Sylvain
3e24d328a9 [feature] statistics: username link leads to admin edition 2016-06-21 14:46:00 +02:00
Sylvain
24f963645b optimize usernames mapping in statistics 2016-06-21 14:39:44 +02:00
Sylvain
4639a15e2f [feature] paginate statistics 2016-06-21 13:16:42 +02:00
Peng DU
2df2d8796d add ngSanitize 2016-06-21 13:03:54 +02:00
Sylvain
cb3cd8ee11 [ongoing] paginate statistics results 2016-06-20 17:13:39 +02:00
Peng DU
9e1468cb31 remove ngAnimate for fix bug cant click element on Chrome 51 2016-06-20 13:20:54 +02:00
cyril
a8b6d1dcc8 fix:ui display price on list plans 2016-06-16 17:49:09 +02:00
Sylvain
ba4115a1da Merge remote-tracking branch 'origin/plugin' into dev 2016-06-16 17:13:36 +02:00
Sylvain
f7d8d18bc8 [feature] paginate public list of members 2016-06-16 16:09:22 +02:00
Sylvain
ddbb043a41 do not retrieve full users list on plans page 2016-06-16 14:26:10 +02:00
Sylvain
dbeb0717df fix show existing collaborator name in project edition 2016-06-16 11:11:03 +02:00
Sylvain
a325211552 optimization collaborators of a project 2016-06-16 09:30:38 +02:00
Sylvain
08244d53dc improve trainings load times
- do not eager load trainings availabilities in INDEX action if not requsted
- in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities
2016-06-15 12:01:09 +02:00
Sylvain
e503d6edd8 optimize trainings API 2016-06-14 15:42:28 +02:00
Sylvain
4bc57c43d2 fix admin user select 2016-06-14 11:30:17 +02:00
Sylvain
49e23062ee [bug] full-calendar date display on small devices 2016-06-14 10:57:27 +02:00
Sylvain
027e18a020 fix typo 2016-06-14 10:51:20 +02:00
Sylvain
f924144fda [feature] member select with lazy loading 2016-06-14 09:57:39 +02:00
Sylvain
48a90bb7b4 advanced project step modulation with automatic re-ordering 2016-06-02 16:02:08 +02:00
Sylvain
2b1d1fc4dd [feature] basic ability manage steps order 2016-06-02 12:49:00 +02:00
Sylvain
0e6698a9ed fix short descriptions in machines index 2016-06-01 13:53:55 +02:00
Sylvain
525f46aba6 [feature] ability to use HTML in machine specs and description 2016-06-01 13:08:09 +02:00
Sylvain
80e03916d9 [feature] display project origin even on origin platform 2016-06-01 11:29:23 +02:00
Sylvain
1bc9db2a65 [feature] 'new project' button in dashboard/my projects 2016-06-01 11:15:01 +02:00
Sylvain
306e0322c5 [feature] display 'draft' badge on drafts 2016-06-01 10:47:00 +02:00
Sylvain
70ff027792 fix AdminMembersController init 2016-06-01 08:55:54 +02:00
Sylvain
fae013d973 members & invoices lists: display 20 items by default + do not display 'load more' button if all items were initially loaded 2016-05-31 17:01:26 +02:00
Sylvain
3593f293ce [feature] partial load of invoices list 2016-05-31 10:02:27 +02:00
Sylvain
c8e9c6dae5 [feature] partial load of users list 2016-05-30 15:39:19 +02:00
Nicolas Florentin
f158ba2890 refacto code insertion code 2016-05-26 15:14:57 +02:00
Nicolas Florentin
822705c54c adds necessary code to permit navi gami plugin to add data in user profile view 2016-05-26 15:14:20 +02:00
Nicolas Florentin
a47a78fe9c simpler way to import scss from plugins 2016-05-26 15:13:36 +02:00
Nicolas Florentin
0c00bf5895 Plugin::Instance can register a stylesheets, enable to import it in application.scss dynamically 2016-05-26 15:13:36 +02:00
Nicolas Florentin
a14130473a plugin underconstruction... ! 2016-05-26 15:13:36 +02:00
Sylvain
26f0aa5e0d fix css layout of public profile for badge inclusion 2016-05-26 14:23:15 +02:00
Sylvain
0be0935474 [feature] add user's job to profile 2016-05-26 12:34:30 +02:00
Sylvain
d009cf3fc1 [feature] add flickr, lastfm & pinterest 2016-05-26 12:05:28 +02:00
Sylvain
7f050223eb Merge branch 'hotfix' into dev
Conflicts:
	CHANGELOG.md
2016-05-24 14:59:07 +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
b19765ad4a change placeholders for social networks + remove contributor status label top margin 2016-05-18 17:21: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
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
Nicolas Florentin
e7590997fc rm dead code 2016-05-10 09:32:09 +02:00
Nicolas Florentin
2c70903dfd admin open_api_client managing 2016-05-09 18:15:04 +02:00
Sylvain
82a9980c20 [bug] is not defined after sso profile sync 2016-05-03 09:37:15 +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
cyril
79b69f21ba Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab 2016-05-02 11:55:15 +02:00
Sylvain
b483b76042 fix arrows in SSO completion 2016-04-25 15:20:00 +02:00
Sylvain
8b8ed342c1 improve responsivness of SSO completion form 2016-04-25 15:14:12 +02:00
Sylvain
33f83180fa fix typo and css 2016-04-25 14:34:09 +02:00
Sylvain
b4ad735d7f change interface for SSO/email already used 2016-04-25 14:30:03 +02:00
Nicolas Florentin
542efe363b projects#index adds tooltip to explain what search over the whole network means 2016-04-25 12:57:35 +02:00
Nicolas Florentin
960f312dc9 projects search params are saved in url query params and remain in browser history 2016-04-25 12:46:30 +02:00
Sylvain
0ee36ca022 refactor interface for SSO profile completion 2016-04-25 12:35:43 +02:00
Nicolas Florentin
5403386c75 fallback and message if openlab server not available 2016-04-25 10:06:35 +02:00
Nicolas Florentin
1a446bf646 frontend openlab search view, ctrl, services 2016-04-22 18:17:55 +02:00
Sylvain
d1a9a69d14 [bug taiga#20] group change not propagated 2016-04-12 10:10:16 +02:00
Sylvain
563266f160 [bug taiga#20] group change not propagated (partial fix) 2016-04-11 19:26:40 +02:00
Sylvain
4b6f3c5ea7 [bug taiga#22] display problem in stats for gender=woman 2016-04-11 18:47:16 +02:00
Sylvain
929e756b10 [bug] fix incorrect VAT rate on invoices 2016-04-06 17:46:24 +02:00
Sylvain
66a37dc692 fix french typo 2016-03-31 14:08:33 +02:00
Sylvain
9bf6025b53 Revert "ask for user agreement to CGV on signup"
This reverts commit 2bf5a60ab5.
2016-03-31 13:00:54 +02:00
Sylvain
2587eaf3cc [feature] link to CGV in about page 2016-03-31 12:59:29 +02:00
Sylvain
2bf5a60ab5 ask for user agreement to CGV on signup 2016-03-31 12:18:07 +02:00
Sylvain
fe9fea2748 fix typo + remove wrong todo 2016-03-30 17:31:12 +02:00
Sylvain
232bdbd102 bug fixes
- [bug] credits not reset on new plan subscription
- [bug] admin notification (user merged his account) never sent
2016-03-30 15:37:33 +02:00
Sylvain
d83e44d26f i18n authentication provider type 2016-03-30 10:05:50 +02:00
Sylvain
305e887112 fix CAD files title translation in projects 2016-03-30 09:46:20 +02:00
Sylvain
d14edbdcfa [bug] unable to edit machine without updating image 2016-03-29 17:01:09 +02:00
Sylvain
ff7e33e5e2 fix training description remain on screen after click 2016-03-29 16:54:51 +02:00
Sylvain
6c32f7e54a fixes in datepicker
- date displayed in inputs has the correct year
- date sent to server match the selected date in html forms
- datepicker date format is configurable for i18n
2016-03-29 13:31:02 +02:00
Sylvain
0ea7e97bd7 [fix] fit plan price to bubble width 2016-03-24 16:23:10 +01:00
Sylvain
e81cc1597a various fix
- handle stripe limitation: plan cannot exceed 1 year
- [bug] unable to change password
- [bug] incorrect value of plans durations in admin list
- [css] plan price was exceeding width of the container
2016-03-24 15:39:24 +01:00
Sylvain
ac0712e5bb i18n plan duration 2016-03-24 14:29:31 +01:00
cyril
d1450f65f6 release 2.0 rc 2016-03-23 18:39:41 +01:00
Sylvain
b267def130 [bug] #2
fixes the lack of user's menu on small devices (can't logout, etc)
2015-10-28 11:55:54 +01:00
cyril
a01d54e10f Merge branch 'master' into dev 2015-10-07 14:07:46 +02:00
Sylvain
9c8f35bd1f fix UI : dashbord button overflow on SM devices 2015-10-06 12:03:46 +02:00
cyril
e8037beaca update fonts 2015-09-18 10:32:25 +02:00
cyril
1dc86f1827 remove env DISQUS_SHORTNAME 2015-05-18 22:08:06 +02:00
cyril
0678c2d582 summernote: add default height to config js 2015-05-18 21:48:10 +02:00
cyril
0f13d1ce42 summernote : add white background css 2015-05-18 21:47:13 +02:00
Nicolas Florentin
e0c721cff7 adds licence in projects/show 2015-05-18 10:23:50 +02:00
Nicolas Florentin
0561cd81ef fix step title was missing in project/form 2015-05-18 10:15:36 +02:00
Nicolas Florentin
4ba033d2b1 improves wysiwyg editor projects 2015-05-13 18:30:35 +02:00
cyril
d6652bd39d fixed label demo above nav 2015-05-08 13:33:24 +02:00
cyril
68eab24fa1 init depot fabmanager 2015-05-05 03:10:25 +02:00