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

2107 Commits

Author SHA1 Message Date
Sylvain
34a2d22771 updated GitHub issue template with link to roadmap 2019-12-10 16:32:15 +01:00
Sylvain
0c11f61010 Prevent event reservation in the past 2019-12-10 12:16:26 +01:00
Sylvain
6aa3c0caeb Notify all admins on the creation of a refund invoice 2019-12-09 11:55:31 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
177c4c3ace updated changelog 2019-12-09 08:33:39 +01:00
Sylvain
7d75810e45
Merge pull request #161 from sleede/dependabot/bundler/puma-3.12.2
Bump puma from 3.10.0 to 3.12.2
2019-12-09 08:31:54 +01:00
dependabot[bot]
2602010770
Bump puma from 3.10.0 to 3.12.2
Bumps [puma](https://github.com/puma/puma) from 3.10.0 to 3.12.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.10.0...v3.12.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-05 23:00:14 +00:00
Sylvain
33ab2ec7d7 moved known issues to a separate doc 2019-12-03 17:33:25 +01:00
Sylvain
22ae8d5073 updated and refactored readme
updated instructions to setup a development environment
splitted readme into multiple files to improve clarity
2019-12-03 17:15:32 +01:00
Sylvain
f50e45d2de rake task to sync users with stripe 2019-12-03 16:32:59 +01:00
Sylvain
60755a2c2a Merge remote-tracking branch 'origin/fix-time-now' into dev 2019-12-03 15:51:22 +01:00
Sylvain
264f10e3e9 updated changelog 2019-12-03 15:50:08 +01:00
Sylvain
11e74c6859 Merge branch 'ics' into dev 2019-12-03 15:30:28 +01:00
Sylvain
64fe68b2b0 icalendar source sync: create/update/delete ical events 2019-12-03 12:16:07 +01:00
Sylvain
538b5cef78 add/remove ical imports in public agenda
also: a little of refacftoring in CalendarController
2019-12-03 11:27:20 +01:00
Sylvain
32e7fc3900 confirm delete icalendar imports + fix display + add translations 2019-12-03 10:48:53 +01:00
Sylvain
d93ce15a47 external calendars legend 2019-12-03 10:23:19 +01:00
Sylvain
122ff54cd8 fix colors in ics imports 2019-12-03 10:17:29 +01:00
Sylvain
5215d0643d Merge branch 'ics' of git.sleede.com:projets/fab-manager into ics 2019-12-03 09:56:37 +01:00
Sylvain
22be9f6a08 display external calendars list in public calendar + pull availabilities 2019-12-02 16:49:20 +01:00
Sylvain
cca6b14f58 import events asyncronously from icalendar 2019-12-02 15:53:24 +01:00
Nicolas Florentin
db41e846dd uses DateTime#current instead of Time.now in tests 2019-12-02 15:29:05 +01:00
Nicolas Florentin
b17bcfde86 comment model slot.rb 2019-12-02 12:39:20 +01:00
Nicolas Florentin
43a05f624a updates changelog 2019-12-02 12:35:01 +01:00
Nicolas Florentin
6ff6c71060 rm dead code Slot#can_be_modified? 2019-12-02 12:32:52 +01:00
Sylvain
55d2c88134 delete & sync ical sources 2019-12-02 12:19:30 +01:00
Nicolas Florentin
77cf8c8218 replaces almost all Time.now by DateTime.current 2019-12-02 11:57:25 +01:00
Sylvain
36eba99808 [bug] report errors on admin creation 2019-12-02 10:39:42 +01:00
Sylvain
f72ae98109 do not show title if calendar is configured to hide them 2019-11-27 17:50:38 +01:00
Sylvain
85d17d62f3 fix events endpoint 2019-11-27 17:44:01 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
baf8cfb487 iCalendar server api & db model 2019-11-27 17:05:19 +01:00
Sylvain
9e2134c9cf ics sources configuration interface 2019-11-27 16:17:42 +01:00
Sylvain
bb777227d6 display events of external ics in calendar 2019-11-27 13:59:56 +01:00
Sylvain
a9b1eabb2c [poc] show google agenda events in the public calendar 2019-11-27 13:51:23 +01:00
Sylvain
90b3564138 admin calendar: surround select item by shadow-box 2019-11-27 12:31:32 +01:00
Sylvain
91008b3df1 improved calendar legend 2019-11-27 11:52:37 +01:00
Sylvain
eb3c78a61d [poc] show google agenda events in the public calendar 2019-11-26 13:44:43 +01:00
Sylvain
48b811d2b5 Added freeCAD files as default allowed extensions
also: refactored some ruby code
2019-11-25 16:12:23 +01:00
Sylvain
68b17cbe9a Ability to show the scheduled events in the admin calendar 2019-11-25 14:49:39 +01:00
Sylvain
563de29b9d Calendar management: improved legend style 2019-11-25 11:59:34 +01:00
Sylvain
452f1cdae4 updated angular.js to 1.7 2019-11-25 11:26:35 +01:00
Sylvain
3a4acbb672
Merge pull request #159 from sleede/dependabot/npm_and_yarn/angular-1.7.9
Bump angular from 1.6.10 to 1.7.9
2019-11-25 11:13:45 +01:00
Sylvain
1d1a163880 updated changelog 2019-11-25 10:52:45 +01:00
Sylvain
5d358efb9f correct conjugation for event canceled 2019-11-25 10:50:32 +01:00
Sylvain
1182822d8b show correct seats nb in canceled reservation 2019-11-25 10:45:54 +01:00
Sylvain
bbd613f2a5 compute right nb of free seats for event reservation
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
2019-11-25 10:30:12 +01:00
Sylvain
ce366beaa2 display that an event reservation was canceled
also: fixed transtions files
2019-11-21 11:15:05 +01:00
dependabot[bot]
261d1666af
Bump angular from 1.6.10 to 1.7.9
Bumps [angular](https://github.com/angular/angular.js) from 1.6.10 to 1.7.9.
- [Release notes](https://github.com/angular/angular.js/releases)
- [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular.js/compare/v1.6.10...v1.7.9)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-20 16:56:02 +00:00
Sylvain
cabe2e5604 update free places after cancel event reservation 2019-11-20 17:06:42 +01:00