Commit Graph

51 Commits

Author SHA1 Message Date
ElPumpo 2c8ecee32f Merge branch 'master' of https://github.com/ESX-Org/esx_society 2018-06-23 01:43:26 +02:00
ElPumpo c33e755357 Updated readme, closes #34 2018-06-23 01:42:26 +02:00
AdrineX febc02cb27 Merge pull request #32 from AdrineX/master
Add Finnish lang...
2018-06-12 18:13:32 -04:00
AdrineX 4dd3312d98 Add Finnish lang... 2018-06-12 21:59:22 +03:00
ElPumpo fce1da377e Improved washing money code, README cleanup 2018-05-07 22:14:59 +02:00
ElPumpo 73f0a7cb10 Fixed aligment 2018-04-30 22:50:02 +02:00
ElPumpo 2a60ff3f1f Fixed sending message to offline player (desc)
- Fixed sending a message to offline players when they get promoted, fired or whatever.
- Improved translation
    - fixed hardcoded message
    - improved translation with the usage of formatting
2018-04-08 23:51:21 +02:00
Samuel 280e6845d8 Merge pull request #25 from Vanheden/patch-1
Create sv.lua
2018-04-08 23:13:58 +02:00
Samuel daab4403c0 Merge pull request #26 from Vanheden/patch-2
Update __resource.lua
2018-04-08 23:13:27 +02:00
Vanheden ca895c4f09 Update __resource.lua 2018-03-07 14:57:42 +01:00
Vanheden 4961dba3f5 Update __resource.lua 2018-03-07 14:56:51 +01:00
Vanheden cafe006b70 Create sv.lua 2018-03-07 14:56:22 +01:00
Don b4b463b0a6 chore(version): Increment version 2017-12-28 08:58:10 -08:00
Don 96233b029c Merge pull request #19 from ElNelyo/master
Add Config.MaxSalary
2017-12-25 15:20:51 -08:00
Charly 7da05ca293 Add Config.MaxSalary 2017-12-26 00:11:58 +01:00
Don 1048e06ee8 Merge pull request #18 from n3x503/patch-1
Update main.lua Money Gitch Patched (line 388 )
2017-12-25 14:29:07 -08:00
n3x503 fa7623acd6 Update main.lua Money Gitch Patched (line 388 )
Added Fix for salary, this patch fix the issue that the boss can change his salary to 100000000 or any other emplyee and actually get the money when the paycheck is given , now the limit is 3000 (max salary input) but you can always change it at the line 390.
Dont forget to add in locals folder at your language a new line , that translate : invalid_amount_max .
2017-12-23 13:24:01 +01:00
Jérémie N'gadi deb262cb12 chore(version): Increment version 2017-09-19 20:19:49 +02:00
Jérémie N'gadi b80538491c Merge pull request #11 from ArkSeyonet/master
Change esx_society function to get firstname,lastname from users table instead of characters table when using Config.EnableESXIdentity
2017-09-19 20:16:14 +02:00
ArkSeyonet 8b33477a27 Update main.lua 2017-09-19 12:33:47 -05:00
Jérémie N'gadi e9ef81d1d1 chore(config): Set Config.EnableESXIdentity to false 2017-09-19 11:46:28 +02:00
Jérémie N'gadi a135475fbd chore(resource): Add version 2017-09-15 15:23:02 +02:00
Jérémie N'gadi d90f533487 Update LICENSE.txt 2017-09-14 23:18:41 +02:00
Romain Lanz fc2ae2a0b3 feat(identity): add identity support for employees' list 2017-09-14 22:15:29 +02:00
Romain Lanz 2fa1ff9ff4 chore(coding-style): correct indentation 2017-09-14 21:21:24 +02:00
Jérémie N'gadi de6e240e33 Add registerSociety event 2017-09-13 14:40:43 +02:00
renaiku f82cf6bb22 bugfix 2017-09-09 19:35:45 +02:00
Jérémie N'gadi 0a0a67ae12 Merge branch 'master' of https://github.com/FXServer-ESX/fxserver-esx_society 2017-09-09 16:33:34 +02:00
Jérémie N'gadi f01d89abf2 Add per-society garage support 2017-09-09 16:33:23 +02:00
Jérémie N'gadi e6e6b5b613 Merge pull request #6 from RomainLanz/patch-1
fix(notification):parameter should be a string
2017-09-05 10:24:14 +02:00
Romain Lanz c8e4d47bf2 fix(notification):parameter should be a string 2017-09-04 10:25:51 +02:00
nearbyplayer 8ce41bf33a Update multi-language support
Update multi-language support
2017-09-03 16:21:16 -04:00
Jérémie N'gadi 1bea07876a Merge pull request #5 from RomainForks/master
chore(ux): add some notifications
2017-09-03 16:40:43 +02:00
Romain Lanz 0442ee2c55 chore(ux): add some notifications 2017-09-03 15:46:40 +02:00
Jérémie N'gadi b92f0ffebd Fix translation + fix setJob 2017-09-03 13:54:36 +02:00
Jérémie N'gadi d37dcb9756 Merge pull request #4 from RomainForks/master
fix(menu): fix the new boss Menu
2017-09-03 13:51:21 +02:00
Romain Lanz 7740735bfe fix(menu): fix the new boss Menu 2017-09-03 13:46:22 +02:00
Jérémie N'gadi 9a202fbf9d Merge branch 'master' of https://github.com/FXServer-ESX/fxserver-esx_society 2017-09-03 11:53:47 +02:00
Jérémie N'gadi fefb430149 Fix typo + Add complete boss menu 2017-09-03 11:53:07 +02:00
Jérémie N'gadi 8e91a65948 Merge pull request #2 from EGUltraTM/master
Add German Language
2017-08-27 09:56:41 +02:00
ultratm 1e7a4bc9e2 Add German Language 2017-08-26 12:57:49 +02:00
renaiku 2b40d5116e update getplayers 2017-08-21 21:02:01 +02:00
Jérémie N'gadi 7d6a8d173f Merge pull request #1 from TakumiBR/master
Multi-language support
2017-08-17 20:06:04 +02:00
TakumiBR d210c5ef4a Multi-language support
Brazilian Portuguese translation.
2017-08-17 09:17:25 -07:00
nearbyplayer cdab4fb686 Multi-language support 2017-08-16 20:50:15 -04:00
Jérémie N'gadi dd5f4f64ab Add LICENSE.txt 2017-08-09 14:15:33 +02:00
Jérémie N'gadi cc1329470e Update esx_society.sql 2017-08-07 12:19:53 +02:00
Jérémie N'gadi 7abb257587 Add files 2017-08-02 11:08:21 +02:00
Jérémie N'gadi 4992d2e458 Update README.md 2017-08-02 11:06:58 +02:00
Jérémie N'gadi 6d7bfa56d3 Update README.md 2017-08-02 11:05:57 +02:00