895 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ydmir	29e5790ec7	Now the search function works in alliance mode as well, searching the corp that is currently active. Also, the select corporation is nicer now.	2016-01-25 23:19:28 +01:00
Adarnof	cd87d90088	Merge pull request #195 from R4stl1n/221 ... Tolerate random 221 errors from API servers	2016-01-24 16:49:16 -05:00
Ydmir	bd7bbc9339	Added portraits in the list, because why not.	2016-01-24 22:32:54 +01:00
Ydmir	986816fdc7	Now sending the character model to the rendering instead of the character names so more info is available.	2016-01-24 21:47:24 +01:00
Ydmir	62efad2b66	Merged changes in master.	2016-01-24 00:27:03 +01:00
Ydmir	25b89fdecb	Expanded functionality to full alliance support. The design may leave some things to wish for...	2016-01-24 00:13:58 +01:00
Ydmir	39a77829db	Added new permission.	2016-01-23 01:11:10 +01:00
Ydmir	f4eac57b0f	Users without a selected main character is not a problem anymore. Main will be listed as "User: [username]" and will be highlighted. Also added a row showing corp of main character.	2016-01-22 21:25:30 +01:00
Adarnof	bbeaade90e	Merge pull request #206 from orbitroom/patch-3 ... fixed fleet operation installed apps bug	2016-01-21 11:28:13 -05:00
Mr McClain	586b08d625	fixed installed apps bug ... forgot to add it to the settings.py example	2016-01-21 03:40:06 -06:00
Adarnof	b46ce75f73	Merge pull request #204 from orbitroom/master ... Added Fleet Operation Timer	2016-01-20 23:54:20 -05:00
Mr McClain	b367c878f9	fixed block errors	2016-01-20 22:53:57 -06:00
Mr McClain	5959519876	fixed grammer	2016-01-20 22:51:02 -06:00
Mr McClain	182c2bf0e2	added more debug code	2016-01-20 22:49:56 -06:00
Mr McClain	6cecf7dbe2	fixed block errors	2016-01-20 22:46:44 -06:00
Mr McClain	f896971351	fixed indentation	2016-01-20 22:36:44 -06:00
Mr McClain	f20bd4ee2e	changed nesting	2016-01-20 22:36:12 -06:00
Mr McClain	0c73328529	added sigtracker and operations timer permissions	2016-01-20 22:32:20 -06:00
Mr McClain	1856d091b8	added more debug code	2016-01-20 22:26:35 -06:00
Mr McClain	3127aba80d	bug fixes for fleet operations timer	2016-01-20 22:21:54 -06:00
Mr McClain	83c83f8b1b	Fixed Indentation Error	2016-01-20 21:53:51 -06:00
orbitroom	bc22473c16	Changed table header to reduce confusion	2016-01-20 22:49:20 -05:00
orbitroom	5ececa6bfd	Changed op timers to Structure Timer and Bug Fixes for Fleet Operations Timer	2016-01-20 22:24:07 -05:00
orbitroom	6fb70b3160	Added Fleet Operations Timer	2016-01-20 22:04:58 -05:00
Mr McClain	69fb154d1a	Merge pull request #7 from R4stl1n/master ... update	2016-01-20 19:49:16 -06:00
Adarnof	49e2a67797	Merge pull request #198 from orbitroom/master ... Added Signature / Wormhole Tracking Tool	2016-01-20 01:16:55 -05:00
Ydmir	b7c1c8469d	Merge branch 'master' into corputils	2016-01-19 22:02:14 +01:00
Adarnof	991049375b	Merge pull request #191 from TrentBartlem/patch-2 ... #190 allow nulls in optional fields	2016-01-18 07:12:12 -05:00
Trent Bartlem	43c6b247f4	Change from null=True to blank=True	2016-01-18 20:20:18 +10:00
Mr McClain	b243ed5e65	made it look pretty	2016-01-18 00:46:16 -06:00
Mr McClain	758c516a41	indentaion updated	2016-01-18 00:44:58 -06:00
Mr McClain	73058539c1	Delete sigtracker.html	2016-01-18 00:40:53 -06:00
Mr McClain	aba3c87d1d	updated ocd indentation errors	2016-01-18 00:36:46 -06:00
Mr McClain	c0e98035d7	Added Creator and timestamps	2016-01-17 22:50:14 -06:00
Mr McClain	c5b384b9a2	Added Creator and timestamps	2016-01-17 22:49:04 -06:00
Mr McClain	194556b56d	Added Creator and timestamps	2016-01-17 22:48:22 -06:00
Trent Bartlem	16dde55098	#190 allow nulls in optional fields	2016-01-17 20:30:00 +10:00
Mr McClain	5bf07765ce	typos fixed	2016-01-17 01:35:31 -06:00
Mr McClain	c08f3693fb	Update base.html	2016-01-17 01:34:31 -06:00
Mr McClain	d2a6837649	typos fixed	2016-01-17 01:32:57 -06:00
Mr McClain	7aa3a19ba5	typos fixed	2016-01-17 01:30:51 -06:00
Mr McClain	d45d2a38d4	typos fixed	2016-01-17 01:28:47 -06:00
Mr McClain	78086e01ac	typos fixed	2016-01-17 01:27:46 -06:00
Mr McClain	dab2383032	typos fixed	2016-01-17 01:26:00 -06:00
Mr McClain	6e2ec4d041	typos fixed	2016-01-17 01:25:17 -06:00
Mr McClain	ce414a6965	typos fixed	2016-01-17 01:24:30 -06:00
Mr McClain	375c97f6eb	typos fixed	2016-01-17 01:23:25 -06:00
Mr McClain	dbb5b8e21e	typos fixed	2016-01-17 01:22:00 -06:00
Mr McClain	7e9033fd2a	made it look pretty	2016-01-17 01:19:10 -06:00
Adarnof	c8df2ad453	Merge pull request #180 from Adarnof/requests ... Closes #170 #169 #137 #181	2016-01-17 02:02:12 -05:00