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

503 Commits

Author SHA1 Message Date
Sylvain
d307f91983 use an hidden form to post export data 2016-07-05 17:23:14 +02:00
Sylvain
4dcab27af2 API generate valid xlsx files 2016-07-05 16:13:11 +02:00
Sylvain
b26bbd18ef API accessing service & conforming server-side access points 2016-07-05 12:21:55 +02:00
Sylvain
38c00391fc basic UI and API for exporting stats to excel 2016-07-04 17:15:37 +02:00
Sylvain
fda619e422 add info message on categories management + fix existing categories slugs 2016-06-30 16:12:24 +02:00
Sylvain
471fe971bc remove course & workshop from seeds file 2016-06-30 15:13:58 +02:00
Sylvain
e930e04ed6 add age&theme filters to statistics 2016-06-30 12:48:46 +02:00
Sylvain
e36df94f0f server-side protection against deleting used filters 2016-06-30 11:39:56 +02:00
Sylvain
c8b42f1b7f add slugs to event filters + add categories into statistics + prevent remove linked elements in front 2016-06-30 11:24:57 +02:00
Sylvain
bb6295c487 prevent from removing the last category 2016-06-30 09:51:06 +02:00
Sylvain
859960ce3e confirmation on event filter deletion 2016-06-30 09:34:26 +02:00
Sylvain
e13870555b ability to link filters to events 2016-06-29 17:05:42 +02:00
Sylvain
bdda4cd7b0 [feature] ability to filter events by category, theme and age 2016-06-29 16:09:27 +02:00
Sylvain
79b97eb113 [feature] manage event's age range 2016-06-29 11:21:21 +02:00
Sylvain
51cce7bbc3 [feature] manage event themes 2016-06-29 10:38:04 +02:00
Sylvain
9adc219edb [feature] manage events categories 2016-06-28 17:06:33 +02:00
Sylvain
4d4248bcca Merge branch 'dev' into events
Conflicts:
	db/seeds.rb
2016-06-28 14:18:15 +02:00
Sylvain
99aa8120fc i18n statistics 2016-06-28 14:07:59 +02:00
Sylvain
9000305a11 fix missing translation in API doc 2016-06-28 11:57:04 +02:00
Sylvain
7d02fa9d9a rename Courses/Workshops to Events 2016-06-28 11:42:20 +02:00
Sylvain
d5b06d08ad [feature] confirmation on project deletion 2016-06-28 10:02:36 +02:00
Sylvain
f6f539d2fc link to openAPI documentation in front interface 2016-06-27 17:23:05 +02:00
Sylvain
875e513f1c Merge remote-tracking branch 'origin/open-api' into dev 2016-06-27 16:31:50 +02:00
Peng DU
df8dbfae8c fix conflt of changelog 2016-06-27 12:42:57 +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
8b699153cc update jbuilder and add cache in progress 2016-06-20 19:41:05 +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
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
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
1bc9db2a65 [feature] 'new project' button in dashboard/my projects 2016-06-01 11:15:01 +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
60c2813991 prepares schedule.yml to code insertion 2016-05-26 15:14:57 +02:00
Nicolas Florentin
3cf75d794f prepare app to receive navi_gami plugin 2016-05-26 15:14:56 +02:00
Nicolas Florentin
a14130473a plugin underconstruction... ! 2016-05-26 15:13:36 +02:00
Sylvain
0be0935474 [feature] add user's job to profile 2016-05-26 12:34:30 +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
1869dd0bcf [bug] project gain collaborator i18n key FR
[UI] project display in profile
2016-05-18 10:54:50 +02:00
Sylvain
284879e0d4 private profile 2016-05-17 17:43:29 +02:00
Sylvain
88de9c3c75 [feature] profile website + edition of is_allow_contact 2016-05-16 14:46:57 +02:00
Sylvain
ca3cd278a4 i18n social networks 2016-05-16 11:30:03 +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
761d243631 adds translations for admin/open_api_clients angularside 2016-05-10 09:31:24 +02:00
Nicolas Florentin
2c70903dfd admin open_api_client managing 2016-05-09 18:15:04 +02:00
Nicolas Florentin
e349adf252 adds open_api's documentation 2016-05-05 15:02:02 +02:00
Nicolas Florentin
7f032526cb implements open_api various endpoints 2016-05-04 18:17:50 +02:00
Nicolas Florentin
92b3471032 creates models open_api client and calls_count_tracing, adds worker to trace calls count 2016-05-04 11:48:14 +02:00
cyril
ad510af829 fix initializers openlab_ruby for env dev 2016-05-02 20:00:39 +02:00
Nicolas Florentin
30105e5af4 fix, openlab_ruby initializer was erasing base_uri 2016-05-02 18:35:59 +02:00
cyril
65c19b3462 fix translate 2016-05-02 17:14:01 +02:00
cyril
7288834417 ui projects list 2016-05-02 16:10:48 +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
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
Nicolas Florentin
f65bb95575 almost finishes synchro with openlab system 2016-04-21 11:42:43 +02:00
Nicolas Florentin
711b18f6cd initial commit 2016-04-20 18:13:36 +02:00
cyril
1099adb208 Merge branch 'tests' into dev 2016-04-20 11:58:09 +02:00
cyril
0f09795243 fix traduction trainings.completed 2016-04-19 16:47:43 +02:00
Sylvain
eb2bc54cec Merge branch '2-0-rc1' into tests 2016-04-13 14:03:28 +02:00
Sylvain
1f8f54d64f mails translations in english 2016-04-11 11:32:32 +02:00
Sylvain
5c7d52a6f3 mails translations in english 2016-04-11 11:31:32 +02:00
Sylvain
2e2f25ce47 fix D3 date format for test 2016-04-06 16:01:59 +02:00
Sylvain
1e39c53d0d configure secrets for tests 2016-04-06 15:55:56 +02:00
Nicolas Florentin
5358cdc19e Merge branch '2-0-rc1' of git.sleede.com:projets/fab-manager into 2-0-rc1 2016-04-05 12:37:20 +02:00
Nicolas Florentin
1ec12ff595 update database name in database.yml.default 2016-04-05 12:36:55 +02:00
Nicolas Florentin
2c2e4dfb51 active_record_base dump_fixtures method handle model without id column 2016-04-05 12:28:22 +02:00
Nicolas Florentin
dd6ecaa1cd finally succeed to generate fixtures from db 2016-04-05 12:05:40 +02:00
cyril
35467173b0 add enable starttls auto for env prod 2016-04-05 11:38:28 +02:00
Nicolas Florentin
a2c09a3ff2 adds rake task to generate fixtures from db, adds a class method to ActiveRecord::Base to generate fixtures 2016-04-05 11:02:49 +02:00
Nicolas Florentin
6bcc03834a adds a method to ActiveRecord::Base to dump a model to fixture 2016-04-05 10:08:29 +02:00
Nicolas Florentin
fafec2153c setup test environment and add the first test 2016-04-04 17:42:45 +02:00
Sylvain
66a37dc692 fix french typo 2016-03-31 14:08:33 +02:00
Sylvain
0273783b91 fix missing translation 2016-03-31 13:13:31 +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
d97c336512 [#16] add email field to reservations export 2016-03-31 11:52:49 +02:00
Sylvain
fe9fea2748 fix typo + remove wrong todo 2016-03-30 17:31:12 +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
6f50d59054 fix english typo 2016-03-29 17:06:30 +02:00
Sylvain
f1181f3994 Merge branch '2-0-rc1' of git.sleede.com:projets/fab-manager into 2-0-rc1 2016-03-29 13:31:12 +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
cyril
c77916b4af remove newrelic gem 2016-03-24 23:01:40 +01:00
Sylvain
efe813945a fixes
- english typo
- [bug] unable to send devise mail
2016-03-24 17:02:42 +01:00
cyril
d1450f65f6 release 2.0 rc 2016-03-23 18:39:41 +01:00
Sylvain
7412bba7f2 add possible issue solution to readme + fix default db config 2015-11-10 11:08:01 +01:00
cyril
1dc86f1827 remove env DISQUS_SHORTNAME 2015-05-18 22:08:06 +02:00
cyril
d5e72c65da add DISQUS_SHORTNAME env 2015-05-08 13:57:04 +02:00
cyril
68eab24fa1 init depot fabmanager 2015-05-05 03:10:25 +02:00