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

293 Commits

Author SHA1 Message Date
Sylvain
150e58d47f test invalid abuse 2016-04-06 14:58:53 +02:00
Sylvain
773e87ecd4 abuses test 2016-04-06 14:45:39 +02:00
Sylvain
76c70b0ed4 basic subscription test 2016-04-06 11:27: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
b6dcacaa8a updates tests to use fixtures 2016-04-05 12:28:42 +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
a5f6839e39 fix users_roles.yml fixture file 2016-04-05 12:27:48 +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
Sylvain
bc051cfd14 fix typos in README 2016-04-05 11:11:14 +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
3e112c13eb removes model and migrations relative to old model machines_pricings 2016-04-05 10:52:29 +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
272400a889 adds a dummy integration test 2016-04-05 10:04:15 +02:00
Nicolas Florentin
26e3f5bf8c adds a test to availability model test 2016-04-05 10:03:58 +02:00
Nicolas Florentin
5d38f1e3a5 does not validate length of availability if start_at or end_at are blank and already missing 2016-04-05 09:57:09 +02:00
Nicolas Florentin
4a1c67c8d5 adds method to parse json reponse 2016-04-05 09:51:12 +02:00
Nicolas Florentin
fafec2153c setup test environment and add the first test 2016-04-04 17:42:45 +02:00
Nicolas Florentin
7dd7fb13f6 removing spec folder 2016-04-04 17:41:32 +02:00
Sylvain
2166157724 fix link in readme 2016-03-31 21:25:23 +02:00
Sylvain
5553c33565 clarified doc about setup of database.yml 2016-03-31 21:16:11 +02:00
Sylvain
66a37dc692 fix french typo 2016-03-31 14:08:33 +02:00
Sylvain
32d5184164 [fix taiga#15] empty workshop attachment not added 2016-03-31 14:02:16 +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
0897fe1e63 update readme 2016-03-31 11:56:58 +02:00
Sylvain
54be4f9e45 update ruby to 2.3
Thix fixes an issue with the PG gem, see https://bitbucket.org/ged/ruby-pg/issues/233/ruby-223-incompatible-library-version
2016-03-31 11:55:13 +02:00
Sylvain
d97c336512 [#16] add email field to reservations export 2016-03-31 11:52:49 +02:00
Sylvain
bd4ce58c64 fix gemset 2016-03-31 10:06:07 +02:00
Sylvain
be37f3fc8a Merge branch 'dev' 2016-03-30 17:33:20 +02:00
Sylvain
fe9fea2748 fix typo + remove wrong todo 2016-03-30 17:31:12 +02:00
Sylvain
9a4eff08d0 [bug] invalid link in migration email 2016-03-30 16:48:47 +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
b5dfcdb3b5 Merge branch 'dev' 2016-03-30 09:20:11 +02:00
Sylvain
5b35cf20ac Merge branch '2-0-rc1' into dev 2016-03-30 09:20:00 +02:00
Sylvain
8a53ae2d2c fix invoice attachement name 2016-03-29 18:02:40 +02:00
Sylvain
6f50d59054 fix english typo 2016-03-29 17:06:30 +02:00
Sylvain
712d809cc2 Merge branch '2-0-rc1' of git.sleede.com:projets/fab-manager into 2-0-rc1 2016-03-29 17:01:42 +02:00
Sylvain
d14edbdcfa [bug] unable to edit machine without updating image 2016-03-29 17:01:09 +02:00
Sylvain
2560c8496d [bug] unable to edit without updating image 2016-03-29 17:00:56 +02:00
Sylvain
ff7e33e5e2 fix training description remain on screen after click 2016-03-29 16:54:51 +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
2f4951255b Merge branch '2-0-rc1' 2016-03-24 23:03:01 +01:00
cyril
7f99a045c8 Merge branch '2-0-rc1' into dev 2016-03-24 23:02:42 +01:00