895 Commits

Author SHA1 Message Date
Mr McClain
38c0e8896a Merge pull request #332 from Adarnof/ts
Prompt users to join TS when creating account
2016-03-25 23:23:04 -05:00
Adarnof
c5afb7c64f Changed verification icon 2016-03-26 03:20:31 +00:00
Adarnof
361e4a6409 Prompt users to join TS when creating account
- will allow groups to sync
 - add button to get back to this prompt
 - do not sync groups until joined server
Closes #331
2016-03-26 03:08:28 +00:00
Mr McClain
ad7ace872f Merge pull request #330 from orbitroom/master
Fixed Bug #329
2016-03-25 13:00:57 -05:00
orbitroom
bd3b8fbf20 Fixed Bug #329 2016-03-25 13:57:23 -04:00
Adarnof
0431b8d0f3 Merge branch 'master' of https://github.com/R4stl1n/allianceauth 2016-03-25 05:32:09 +00:00
Adarnof
f615f9354a Trigger ts group update on AuthTS changes 2016-03-25 05:31:39 +00:00
Mr McClain
891bdda9eb Update models.py 2016-03-24 20:01:35 -05:00
Mr McClain
37c31741c3 Merge pull request #328 from orbitroom/master
Fixed Error in Template Rendering
2016-03-24 19:30:36 -05:00
orbitroom
ac5ee52ff8 Fixed Error in Template Rendering 2016-03-24 20:26:08 -04:00
Mr McClain
3f487cb92e Merge pull request #327 from orbitroom/master
Added SRP Enhancements
2016-03-24 17:42:30 -05:00
orbitroom
2f5d6d4871 Added Enhancements to SRP Management 2016-03-24 18:36:46 -04:00
Adarnof
428f044f7f Re-add TS3 group sync periodic task 2016-03-24 18:04:45 +00:00
Adarnof
0a0073509c Increase ApplicationQuestion title size limit 2016-03-24 17:53:53 +00:00
Adarnof
9faf16fece List completed applications for superuser 2016-03-24 17:46:55 +00:00
Mr McClain
8dad132605 Merge pull request #1 from R4stl1n/master
sync
2016-03-23 20:40:13 -05:00
Mr McClain
6223935e34 Merge pull request #321 from orbitroom/master
Added ship type and total loss that populates from zkillboard
2016-03-23 20:33:30 -05:00
Mr McClain
8c34cebd22 Update views.py 2016-03-23 20:30:09 -05:00
Mr McClain
959df638fa Update srp_manager.py 2016-03-23 20:25:47 -05:00
Mr McClain
9cf50bc5fe Update srp_manager.py 2016-03-23 20:25:02 -05:00
Mr McClain
12ede722b0 Update srpfleetdata.html 2016-03-23 20:19:28 -05:00
Mr McClain
5b26141748 Update srpfleetdata.html 2016-03-23 20:18:58 -05:00
Mr McClain
ec395ae9af Update views.py 2016-03-23 20:11:31 -05:00
Mr McClain
c1b56e6faa Update form.py 2016-03-23 20:10:33 -05:00
orbitroom
f92e8a8ae5 Corrected grammar in debug code. 2016-03-23 17:11:46 -04:00
orbitroom
365cdcbd35 sync before push 2016-03-23 17:06:13 -04:00
orbitroom
b914d2f4bb Added Form Validation 2016-03-23 17:05:38 -04:00
Mr McClain
1d09108dbf Update views.py 2016-03-23 13:50:28 -05:00
Adarnof
8fb5058b2f Get current model from db on service group update 2016-03-23 17:10:37 +00:00
Adarnof
44beee4d53 Update tasks.py 2016-03-23 12:38:21 -04:00
Adarnof
db12e9862b correct service checks 2016-03-23 12:34:21 -04:00
Mr McClain
695ae8d7ef Updated Debug Code 2016-03-23 03:02:19 -05:00
Mr McClain
b2c409d885 Update views.py 2016-03-23 02:59:37 -05:00
orbitroom
9560bbb1d0 Added Notifications to SRP 2016-03-23 03:56:17 -04:00
orbitroom
5072634542 Updates 2016-03-23 03:54:28 -04:00
orbitroom
04fcdbea1f Added Notifications to SRP 2016-03-23 03:53:48 -04:00
Mr McClain
aee5e8ee09 Update views.py 2016-03-23 01:35:00 -05:00
orbitroom
183fd129cc Changed Format to only allow zkillboard links 2016-03-23 02:26:13 -04:00
orbitroom
8f59268ce5 Merge branch 'master' of https://github.com/orbitroom/allianceauth 2016-03-23 02:19:28 -04:00
orbitroom
0223836a90 Added Error handling to enforce using of zkillboard 2016-03-23 02:18:46 -04:00
Mr McClain
3c75874965 Update form.py 2016-03-23 00:57:28 -05:00
orbitroom
90a68cda21 Merge branch 'master' of https://github.com/orbitroom/allianceauth 2016-03-23 01:44:08 -04:00
orbitroom
faf5c473d8 Added Automatic Ship and ISK Fields 2016-03-23 01:40:46 -04:00
Adarnof
51e3c287b6 Merge pull request #308 from Adarnof/mumble
Mumble Ice Authenticator
2016-03-23 00:31:18 -04:00
Adarnof
a2c1ac6432 Merged requirements for update script 2016-03-23 04:27:40 +00:00
orbitroom
376bf60421 Added the option to view shiptypes of killmails 2016-03-23 00:16:43 -04:00
Adarnof
16757812af Merge pull request #320 from R4stl1n/hrapp
Implement additional requests in #305
2016-03-23 00:10:00 -04:00
Adarnof
a425d32405 Implement additional requests in #305 2016-03-23 03:47:24 +00:00
Mr McClain
ae1da75d81 Merge pull request #319 from Adarnof/receiver
Replace run_databaseUpdate with m2m receiver
2016-03-22 21:04:44 -05:00
Mr McClain
a419145f7c Added Manager 2016-03-22 20:36:36 -05:00