rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-13 23:48:55 +01:00
Code Issues Releases Activity
3,206 Commits 15 Branches 274 Tags 83 MiB
72d79e8e31
Commit Graph

408 Commits

Author SHA1 Message Date
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
9ef2f142bd link HistoryValue to InvoicingProfile + improved invoices tests 2019-06-03 16:51:43 +02:00
Sylvain
7ed97ef35a link wallet & its transactions to invoicingprofile 2019-06-03 16:00:09 +02:00
Sylvain
6011f27268 finish moving organization & address to invoiving profile: fix create & edit user 2019-06-03 12:06:01 +02:00
Sylvain
a211ad39ff moving organization & address to invoicingProfile + refactored doc about postgre 2019-05-29 14:28:14 +02:00
Sylvain
142e07f3c9 update code to use invoicingprofile 2019-05-29 12:01:24 +02:00
Sylvain
ffbca98276 [ongoing] fix api to use the invoicing_profile 2019-05-28 16:49:36 +02:00
Sylvain
b423d9fce7 add link to interface in abuse report mail 2019-05-21 12:38:07 +02:00
Sylvain
7bbea22e76 display reports in interface 2019-05-21 11:49:50 +02:00
Sylvain
dd4b6e2cb1 [ongoing] abuses management interface 2019-05-09 18:27:19 +02:00
Sylvain
26b901ebb5 [bug#131] Availabilities export report an erroneous number of reservations for machine availabilities 2019-05-07 12:24:51 +02:00
Sylvain
162a56250a notify users after privacy policy update + hide undefined content 2019-04-25 11:40:26 +02:00
Sylvain
c0c9b2a980 privacy policy: fixed admin view after update + display last update date 2019-04-23 12:58:01 +02:00
Sylvain
7a2fc7c42e [ongoing] save as draft or publish 2019-04-18 15:57:56 +02:00
Sylvain
43ff06c35d fixed and improved translations 2019-04-18 11:35:09 +02:00
Sylvain
9f8d24ec4f paginate list of coupons 2019-04-04 17:28:29 +02:00
Sylvain
c223bd99ea add loader while archive is not ready 2019-04-04 12:55:21 +02:00
Sylvain
c786ba6edb notify user about archiving 2019-04-04 11:37:23 +02:00
Sylvain
93ff761e64 [bug] Error :syntax when using quote in event category name 2019-04-02 16:19:23 +02:00
Sylvain
7a317b7e45 [bug] unable to add a file attachment to an event 2019-03-28 11:30:25 +01:00
Sylvain
75310d599f Merge branch 'host' into dev 2019-03-26 14:33:30 +01:00
Sylvain
01ac73a1a1 removed capistrano & unicorn + cleaned lacasemate brading 2019-03-26 10:40:58 +01:00
Sylvain
2ac0336adb Merge branch 'dev' into host 2019-03-25 16:17:23 +01:00
Sylvain
5cdaa014ef [security] updated devise + updated rails 2019-03-25 14:57:48 +01:00
Sylvain
8530a6f655 superadmin + fixed free space notification 2019-03-20 16:49:38 +01:00
Sylvain
03c0c0d4fb close periods at 1 year minus 1 day + fix alert reminder transalation 2019-03-18 14:45:21 +01:00
Sylvain
7b0824a4a3 notify admins when no accounting period closed for 1 year 2019-03-18 14:33:30 +01:00
Sylvain
4f418cc3fb compute total without taxes + fix close period date pickers + improved archived % number format 2019-03-12 13:36:10 +01:00
Sylvain
b9e427a9fc include VAT in archives 2019-03-12 12:15:14 +01:00
Sylvain
2a32bc4752 date the archives 2019-03-11 16:25:51 +01:00
Sylvain
b940ae0327 display complete info set on accounting archives 2019-03-11 16:11:49 +01:00
Sylvain
9854a4b965 prevent memory saturation with periodic checks 2019-02-26 15:18:19 +01:00
Sylvain
f11f629bcf compute, secure and archive period total and cumulative total of each accounting period 2019-02-25 14:51:19 +01:00
Sylvain
cf23fae73c Merge branch 'dev' into host 2019-02-14 16:35:38 +01:00
Sylvain
7b573dd37f restored deprecated notification 2019-02-14 13:05:09 +01:00
Sylvain
2ba3890325 display records integrity status 2019-02-12 16:00:36 +01:00
Sylvain
f9364b3872 chains invoice and invoiceItem records. save them in archives 2019-02-12 14:45:21 +01:00
Sylvain
6e274afe3b accounting archive: insert code checksum and previous archive checksum 2019-01-31 12:19:50 +01:00
Sylvain
da672ea8b6 Merge branch 'dev' into host 2019-01-21 16:34:06 +01:00
Sylvain
75eaf4d4d0 improved member autocompletion with multiple words + refactored members controller 2019-01-21 15:17:56 +01:00
Sylvain
d2c4773ac9 [bug] unable to delete an admin who has changed a setting 2019-01-16 17:09:27 +01:00
Sylvain
eb69822ce0 Merge branch 'dev' into host 2019-01-14 15:00:55 +01:00
Sylvain
77797db2f1 display VAT rates history 2019-01-14 15:00:33 +01:00
Sylvain
a1ba272538 Merge branch 'dev' into host 2019-01-14 13:00:24 +01:00
Sylvain
f6e236aeb5 refactored roles methods to match ruby conventions 2019-01-14 12:57:31 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
4b5bd74188 add invoice_items in accounting archive 2019-01-10 13:05:57 +01:00
Sylvain
b42d1614fd export to flat json files closed periods 2019-01-10 10:52:29 +01:00
Sylvain
5e8172af35 Merge branch 'dev' into us78 2019-01-09 16:28:36 +01:00
Sylvain
5ab0333176 rubocop invoice & avoir 2019-01-09 16:28:23 +01:00
Sylvain
d8c8e4f72f set default dates in close modal pickers 2019-01-07 17:21:32 +01:00
Sylvain
5b13c59496 list existing closings in close period modal 2019-01-07 16:45:31 +01:00
Sylvain
d89f9e9301 close an accounting period from interface to db through api 2019-01-07 15:33:09 +01:00
Sylvain
f2eaf4e4e1 improved tests and bug fixes 2018-12-11 17:27:25 +01:00
Sylvain
6794b12555 force gawk during elastic upgrade & rubocop 2018-12-03 15:10:04 +01:00
Sylvain
9af1e5c658 fixed User.to_json 2018-07-24 11:13:05 +02:00
Sylvain
7afe62522f refactor User.as_json to use jbuilder template 2018-07-04 14:05:44 +02:00
Sylvain
679ccfec99 ability to share trainings on social medias 2018-01-09 15:09:48 +01:00
Sylvain
290b2ad513 [bug] facebook sharing of event has HTML tags in description 2018-01-09 15:02:45 +01:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev 
also: align translations and mark missings
 2017-11-20 11:43:40 +01:00
Sylvain
639610dc7a [bug] unable to display profiles of users whom any reservation is associated with a deleted object 2017-11-13 11:15:33 +01:00
Sylvain
f4fd919dde display disabled status for machines & trainings in openAPI 2017-10-11 16:03:04 +02:00
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
5ce6d4486e fix profile complete mail template for non imported users 2017-10-11 11:56:43 +02:00
Sylvain
4752fce762 disable required training modal for machines associated with disabled trainings 2017-10-10 18:12:07 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
189665e53b [ongoing] prevent disable group with users + [ongoing] hide disabled groups 2017-10-05 17:54:44 +02:00
Sylvain
c5f0501df2 enable/disable group 2017-10-05 16:48:18 +02:00
Sylvain
26d79e5b12 disable a plan 2017-10-04 18:56:39 +02:00
Sylvain
601ac177b6 [bug] rendering for social networks shares 2017-09-26 15:48:47 +02:00
siteswapjuggler
5fe1a53237 double slashes correction in open API event JSON 
correction of the double slash as requested
 2017-09-24 18:37:08 +02:00
siteswapjuggler
52071c7b83 Merge remote-tracking branch 'LaCasemate/master' 2017-09-10 12:01:59 +02:00
Sylvain
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02:00
siteswapjuggler
73c9e301fb open api events improvement 
new data available: start_at, end_at, event_image
new controllers: id, upcoming, limit
 2017-09-03 13:55:38 +02:00
Sylvain
dcf55d8351 [bug] invalid notification text when sending amount coupon 2017-08-29 16:10:16 +02:00
Sylvain
295dc3749b [bug] filename too long on events&prices API + updated axlsx 2017-08-16 12:05:04 +02:00
Sylvain
00d157dc3b [bug] filename too long error on GET api/groups 2017-07-26 10:15:47 +02:00
Sylvain
3e44d62aac [bug] filename too long error on GET api/trainings 2017-07-18 10:55:41 +02:00
Sylvain
8531168ba2 improve RSS with project author and image + event dates image and category 2017-05-17 12:18:20 +02:00
Sylvain
89e30980e0 [bug] unable to set locale other than fr or en 2017-04-27 18:35:00 +02:00
Peng DU
1d53e3b5b7 fix json template of training reservation 2017-03-28 19:53:48 +02:00
Sylvain
d8b8c39cb3 add day of week to availabilities export 2017-03-02 13:31:12 +01:00
Sylvain
c21f7ed5dc export events availabilities 2017-03-02 13:05:29 +01:00
Sylvain
056060a88d export spaces availabilities 2017-03-02 12:57:07 +01:00
Sylvain
d9b30fa2b0 export trainings availabilities 2017-03-02 12:44:59 +01:00
Sylvain
504fe49964 export machines availabilities 2017-03-02 12:34:28 +01:00
Sylvain
4d09ed37a3 export machines availabilities 2017-03-02 12:34:16 +01:00
Sylvain
13689fd707 set spaces disabled by default 2017-03-01 15:50:49 +01:00
Sylvain
c9d6df13f9 disable space projects 2017-03-01 14:30:53 +01:00
Sylvain
cdefcebf4c fix typo 2017-03-01 12:59:59 +01:00
Sylvain
c936b283f7 display spaces status in client calendar 2017-02-28 16:51:56 +01:00
Sylvain
0e94f8c3d4 Redo "change DB model to allow many_to_many relationship between Slot and Reservation" 
This reverts commit 4cbfbdc4e0.
 2017-02-28 13:23:31 +01:00
Sylvain
4cbfbdc4e0 Revert "change DB model to allow many_to_many relationship between Slot and Reservation" 
This reverts commit 03d922e214.
 2017-02-28 12:36:50 +01:00
Sylvain
a0e7e7951f [ongoing] display spaces in public calendar 2017-02-28 11:59:48 +01:00
Sylvain
847a0ba140 display correct slot status in space reservation calendar 2017-02-27 16:15:27 +01:00
Sylvain
03d922e214 change DB model to allow many_to_many relationship between Slot and Reservation 2017-02-27 13:15:31 +01:00
Sylvain
8e86c4b212 [ongoing] spaces reservation calendar 2017-02-23 17:45:55 +01:00
Sylvain
8ea611882b fix training reservation 2017-02-23 11:13:25 +01:00
Sylvain
03758d336c fix move & cancel training reservation + fix display after cancel for machines & training 2017-02-22 17:45:22 +01:00
Sylvain
1959856235 use the cart directive in training reservation 2017-02-22 16:45:13 +01:00
Sylvain
5a41424579 fixed & improved js routing 2017-02-21 15:41:45 +01:00
Sylvain
23b9851218 allow enable/disable spaces -> disabled by default 2017-02-15 15:41:25 +01:00
Sylvain
1855935322 interface to create space availabilities 2017-02-15 11:32:29 +01:00
Sylvain
0adb9e29c6 space edition interface 2017-02-14 13:36:10 +01:00
Sylvain
73a5689140 inteface to display spaces 2017-02-14 12:41:51 +01:00
Sylvain
05d4b7b3c5 spaces api 2017-02-13 16:10:12 +01:00
Sylvain
c479502dd0 [bug] too many unread notifications cause system memory overflow 2017-01-05 15:06:54 +01:00
Sylvain
a7fdc4d741 fix potentital issue with sso + enterprise profile 2016-12-14 15:55:12 +01:00
Sylvain
3ce41f0c5c [to test] send cash coupon to user by mail 2016-11-24 18:17:49 +01:00
Sylvain
0a08c4c32d check cash coupons does not exceed cart amount for subscriptions 2016-11-24 16:38:22 +01:00
Sylvain
04e10c8bb6 check cash coupons does not exceed cart amount for trainings & machines 2016-11-24 13:58:41 +01:00
Sylvain
c13f640e81 remove rails find_by_* helpers 2016-11-23 16:30:19 +01:00
Sylvain
cc06bcab85 fix cash coupon creation on stripe + store amount in centimes 2016-11-23 15:44:59 +01:00
Sylvain
ad2911529c db model, api and interface for cash coupons 2016-11-23 12:43:42 +01:00
Sylvain
d46e6cf9c9 [members excel export] invoicing disabled 2016-11-16 15:08:24 +01:00
Sylvain
da71ba783c [bug] exports for events reservation always have seats=1 (fixes #54) 2016-11-09 15:01:58 +01:00
Peng DU
99cca406d5 fix bug: event date period dant show correct in invoice 2016-11-03 12:17:19 +01:00
Peng DU
9dca65786a fix project step images height bug 2016-11-03 11:26:01 +01:00
Peng DU
ba5e5752a4 allow add more picture for project step 2016-11-02 14:58:06 +01:00
Sylvain
c500518c28 [bug] sharing project or event w/o image on social network render error 500 2016-10-11 16:07:34 +02:00
Kenneth Lim
18bc37749b
locale: informations --> information 
Not sure if this helps but information does not require an `s`. :)

Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
 2016-10-07 17:11:58 +08:00
Sylvain
1ef2c11355 add links to RSS feeds into application header 2016-09-29 11:54:08 +02:00
Sylvain
34ad1c9056 move RSS code into separate folders 2016-09-29 10:53:20 +02:00
Sylvain
376cb6dbe9 Merge branch 'rss_feeds' of git://github.com/Vincent14/fab-manager into Vincent14-rss_feeds 2016-09-29 10:09:15 +02:00
cyril
a0fef8d046 bug fix: not to force https in env production for root_url helper 2016-09-28 13:58:22 +02:00
Sylvain
60d60fdd65 use slugs in projects URL opened from notifications 2016-09-27 16:58:57 +02:00
Sylvain
e48bb88f1f use slug in traning show url 2016-09-27 16:00:22 +02:00
Sylvain
bf9ea40648 [feature #40] project images will show in full-size on a click 2016-09-27 11:50:05 +02:00
Sylvain
6401b321ef [feature] display fab-manager's version, when logged as admin 2016-09-22 16:46:14 +02:00
Peng DU
5d6aa163b5 change groups cache key name 2016-09-20 11:39:49 +02:00
Vincent
6920793ce1 add RSS feed to events index 2016-09-15 22:22:35 +02:00
Vincent
a5c6ba5f7d add RSS feed to projects index 2016-09-15 21:50:08 +02:00
Sylvain
13f416a101 [sso] save and restore field data mapping 2016-09-15 15:58:21 +02:00
Sylvain
50543b8d09 [sso] give informations about the expected data in sso mapping 2016-09-14 16:41:45 +02:00
Sylvain
ec0f597067 [sso] display strategy name in providers list 2016-09-13 12:06:25 +02:00
Sylvain
9d599a14e5 display custom aggregations in front statistics 2016-09-06 16:53:04 +02:00
Sylvain
87104a6b97 remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events 2016-08-31 11:58:37 +02:00
Sylvain
b9411366c2 update nb of free places after moving an event reservation with custom prices 2016-08-30 12:34:36 +02:00
Sylvain
feda4861f2 ability to move reservation with custom fares reservations 2016-08-30 11:27:25 +02:00
Sylvain
f175b4b28e display custom prices places names in reservation summary after booking an event 2016-08-30 10:17:52 +02:00
Sylvain
8aef50660a show custom price reservations in admin/events/show reservations 2016-08-29 17:51:11 +02:00
Sylvain
3d1c852576 show custom prices bookings in admin/editMember 2016-08-29 16:54:10 +02:00
Sylvain
af883ea1ec show custom price tickets booked in event show 2016-08-29 16:28:26 +02:00
Sylvain
4fd31c3e9b display custom prices in event show 2016-08-25 15:36:52 +02:00
Sylvain
5d91756ace ability to edit event with custom prices 2016-08-25 13:56:07 +02:00
Sylvain
500a466371 full ability to create price categories 2016-08-24 16:21:43 +02:00
Sylvain
6c3dfab0a9 API for price categories management 2016-08-24 12:30:48 +02:00
Sylvain
cc1d6e4f21 [not tested] send reminder notification every hours for upcoming reservations 2016-08-17 17:39:12 +02:00
Sylvain
428b2db0ea send a coupon to a user 2016-08-16 18:12:13 +02:00
Sylvain
a63c1830cd better fix for events categories 2016-08-11 11:33:55 +02:00
Sylvain
e2ea64cf9c coupon edition + refactored coupon status 2016-08-08 15:21:33 +02:00
Sylvain
a6ded12ee9 create/delete coupons on stripe + adjust schema to match stripe requirements 2016-08-08 14:42:17 +02:00
Sylvain
7c434db09a interface to create new coupons 2016-08-04 18:13:19 +02:00
Sylvain
0eaa81b0ba extracted some heavy admin views into sub-templates files & fixed uncomplete users display behavior in admin list 2016-08-04 12:08:33 +02:00
Sylvain
ce31c1412b coupons usages are counted with invoices 2016-08-04 09:45:00 +02:00
Sylvain
84a7e81813 API for coupons 2016-08-03 17:56:36 +02:00
Sylvain
c9a7c599c0 notify admin about organization registration & organization server validation 2016-08-02 18:06:07 +02:00
Sylvain
af94b62ff1 add organization infos to members xlsx export 2016-08-02 15:28:24 +02:00
Sylvain
33358c2fb5 ability to edit organization in profile & ablity to link its params from an sso 2016-08-02 15:11:26 +02:00
Sylvain
bd54ad8158 ability to share events on social networks twitter & fb 2016-08-01 16:19:50 +02:00
Sylvain
26d5e5e42c allow social share of projects on twitter & facebook 2016-08-01 15:45:56 +02:00
Sylvain
dbc199cbba project preview in facebook open graph 2016-07-28 17:44:58 +02:00
Sylvain
5f96c9916d [feature] newsletter : ask conscent + export in xlsx 2016-07-28 12:20:51 +02:00
Sylvain
a2066d8c09 [feature]async generation of users exports 2016-07-27 17:00:06 +02:00
Sylvain
4d2f46ca95 [feature] Async statistics export to XLSX 
- fix tests due to removal of event_categories
- rake task for generating statistics
 2016-07-27 11:28:54 +02:00
Sylvain
74154cf1f3 Merge branch 'xls' into dev 
Conflicts:
	CHANGELOG.md
	app/helpers/application_helper.rb
	config/locales/en.yml
	config/locales/fr.yml
 2016-07-25 16:56:22 +02:00
Sylvain
32d239f723 [Bug #28] Event type disappear when editing the event 2016-07-25 16:16:25 +02:00
Peng DU
909c204af5 show invoice download link in wallet transaction debit operator 2016-07-21 16:32:57 +02:00
Peng DU
4f42253d3d wallet transaction list operation locale 2016-07-21 16:32:55 +02:00
Peng DU
fc7eaaab94 add notification and alert when user wallet credit 2016-07-21 16:32:54 +02:00
Peng DU
d0956bb0aa show wallet transactions of user 2016-07-21 16:32:54 +02:00
Peng DU
db8a6e8a32 application can show user wallet 2016-07-21 16:32:53 +02:00
Peng DU
79ef7f4188 refactoring show training controller and add a new action avaibilities 2016-07-19 12:16:41 +02:00
Peng DU
70d623f65a filter calendar by machine/formation/event or disponible 2016-07-14 18:36:52 +02:00
Peng DU
066458ca70 availability type filter 2016-07-14 12:20:03 +02:00
Peng DU
1fc4439df8 click slot to show machine fetch 2016-07-14 12:20:03 +02:00
Peng DU
49ee5011c1 show availability with reservation state 2016-07-14 12:20:02 +02:00
Peng DU
e9c1584968 availability public api 2016-07-14 12:20:02 +02:00
Peng DU
44b0fd8aa8 get availability border color in helper 2016-07-14 12:20:01 +02:00
Peng DU
0af0cc7878 update angular-ui-calendar and ajax load availabilites 2016-07-14 12:20:01 +02:00
Peng DU
1529e4b14e allow active/disactive a training to show in training lists 2016-07-14 12:18:24 +02:00
Sylvain
6839e8db38 Merge branch 'events' into dev 
Conflicts:
	CHANGELOG.md
	config/locales/app.shared.en.yml
	config/locales/app.shared.fr.yml
 2016-07-13 18:32:30 +02:00
Sylvain
90142ae3bb Merge branch 'training' into dev 2016-07-13 18:15:14 +02:00
Sylvain
e765267bb5 fix export for missing users 2016-07-13 18:09:32 +02:00
Sylvain
68f9324725 Merge branch 'steps' into dev 
Conflicts:
	app/assets/javascripts/controllers/projects.coffee.erb
	db/schema.rb
 2016-07-13 16:10:18 +02:00
Sylvain
2c8001f38f Merge branch 'projects' into dev 
Conflicts:
	app/views/api/members/show.json.jbuilder
 2016-07-13 15:57:45 +02:00
Sylvain
cbeb78fd7e fix members full export 2016-07-13 09:20:52 +02:00
Sylvain
3413c3040b [ongoing] members export full infos 2016-07-12 17:46:19 +02:00
Sylvain
827b3334e1 migrate export subscriptions to axlsx 2016-07-12 13:10:06 +02:00
Sylvain
85912603a2 migrate export reservations to axlsx 2016-07-12 13:00:56 +02:00
Sylvain
d72e39f716 migrate export members to axlsx 2016-07-12 12:48:26 +02:00
Sylvain
d84238b331 statistics: global export to excel 2016-07-12 12:03:38 +02:00
Sylvain
569cc1b737 use theme primary in export header 2016-07-07 17:15:54 +02:00
Sylvain
8e968f7813 fix type key transmission 2016-07-07 16:57:23 +02:00
Sylvain
0f7f2c256a [export] handle data type in custom fields 2016-07-07 16:34:28 +02:00
Sylvain
022db4e486 export all stats indices to excel 2016-07-07 16:26:25 +02:00
Sylvain
8e8bd3f9eb full subscriptions export 2016-07-07 15:31:22 +02:00
Sylvain
b0f7c634ea subscriptions export with all rows 2016-07-06 19:00:22 +02:00
Peng DU
e57d5c96e6 cancel cache machine index json 2016-07-06 11:22:01 +02:00