rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity
2,135 Commits 15 Branches 273 Tags 82 MiB
3412d9e35c
Commit Graph

2135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sylvain
b725a5a071 Merge branch 'cancel' into dev 2019-11-20 10:27:56 +01:00
Sylvain
37d6c84cc6 [bug] unable to remove training picture 
also: removed some invalid href=# in the templates
 2019-11-19 15:18:00 +01:00
Sylvain
ad928bd4e6 ability to set phone number optional or required 
also: show stars on required fields in new admin form
 2019-11-19 11:44:32 +01:00
Sylvain
9ec736e6b5 delete recursive slots 2019-11-18 17:29:51 +01:00
Sylvain
71d7b68218 Merge branch 'recurrence' into dev 2019-11-18 12:15:10 +01:00
Sylvain
26738563bd create reccursive events 2019-11-18 11:50:20 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
0d740c95a9 recapitulative screen 2019-11-13 10:59:10 +01:00
Sylvain
22251e6516 summary screen 
TODO: eventModal.html.erb:167
 2019-11-12 16:28:10 +01:00
Sylvain
2cccbd3486 recurrence UI 2019-11-12 14:25:28 +01:00
Sylvain
df26e4de4a updated changelog 2019-11-07 19:38:29 +01:00
Sylvain
ccea6ac172
Merge pull request #157 from sleede/dependabot/bundler/loofah-2.3.1 
Bump loofah from 2.3.0 to 2.3.1
 2019-11-07 19:33:15 +01:00
dependabot[bot]
279e5f692b
Bump loofah from 2.3.0 to 2.3.1 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-07 18:00:54 +00:00
Sylvain
a42e9daa7f Merge branch 'hotfix' into dev 2019-10-30 16:36:30 +01:00
Sylvain
93f8c4452f Merge branch 'hotfix' for release 4.2.4 2019-10-30 15:59:07 +01:00
Sylvain
a87243f212 Version 4.2.4 2019-10-30 15:58:50 +01:00
Sylvain
9b3c2fab36 updated changelog 2019-10-30 15:53:20 +01:00
Sylvain
c6c0881e84 updated changelog 2019-10-30 15:52:13 +01:00
Nicolas Florentin
9629782be7 try to fix edge cases of VatHistoryService, related to issue #156 2019-10-30 15:50:47 +01:00
Sylvain
a2597a982e updated changelog 2019-10-30 15:45:54 +01:00
Sylvain
a755f34372 updated changelog 2019-10-30 15:44:00 +01:00
Sylvain
d044a3147a Ability to configure the duration of a reservation slot 
Merge branch 'slot-duration' into dev
 2019-10-30 15:39:41 +01:00