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

66 Commits

Author SHA1 Message Date
Sylvain
875e513f1c Merge remote-tracking branch 'origin/open-api' into dev 2016-06-27 16:31:50 +02:00
Sylvain
8e07460deb [feature] redirect to slugged-url on publish project 2016-06-27 15:34:08 +02:00
Peng DU
df8dbfae8c fix conflt of changelog 2016-06-27 12:42:57 +02:00
Peng DU
60f504c660 event categoriy is required 2016-06-22 18:56:45 +02:00
Sylvain
9b8e3eba88 Merge branch 'stats' into dev 2016-06-21 17:11:40 +02:00
Peng DU
85a40db603 price cache 2016-06-21 16:04:44 +02:00
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
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
f924144fda [feature] member select with lazy loading 2016-06-14 09:57:39 +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
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
a14130473a plugin underconstruction... ! 2016-05-26 15:13:36 +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
a66b314e7b [feature] background picture of profile banner customization 2016-05-18 16:15:54 +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
0061c3dca6 reorganize profile header zone 2016-05-17 16:41:32 +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
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
b4ad735d7f change interface for SSO/email already used 2016-04-25 14:30:03 +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