Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v0.14.0 into master #374

Merged
merged 76 commits into from
Mar 5, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
a67ffff
add external links to character screen
Delt4Nin3 Jan 12, 2015
cea826c
Merge pull request #326 from LunarchildEU/character-external
eve-seat Jan 12, 2015
a88112b
fixed heavy interdiction cruiser typeID on skill sheet and added indu…
gattebury Jan 12, 2015
7af6ef0
Merge pull request #329 from gattebury/hac_indy_skills
eve-seat Jan 12, 2015
21f7bf6
add tab with ORE ships
Delt4Nin3 Jan 13, 2015
d44b49a
Remove gitignore cause CRLF issues
eve-seat Feb 5, 2015
2124fd9
added incursions section to wallet ledger
sn0opy Feb 5, 2015
0c727c3
[BUGFIX] Added migration to set columns last_login and last_login_sou…
skarp2 Feb 5, 2015
d88d8c0
Merge pull request #336 from LunarchildEU/ore-shipskills
eve-seat Feb 7, 2015
81d2e08
Merge pull request #340 from sn0opy/corp-wallet-incursions
eve-seat Feb 7, 2015
a5b6660
Merge pull request #343 from skarp2/users-table-nullable-cols
eve-seat Feb 7, 2015
a39e2b9
added total value of all account balances
sn0opy Feb 5, 2015
3259893
Merge pull request #342 from sn0opy/wallet-total
eve-seat Feb 7, 2015
7a08839
Add first Centos 7 Install guide
eve-seat Feb 13, 2015
2118678
Increase avatar quality
Feb 17, 2015
079b57d
Create a basic troubleshooting guide
Nutbolt52 Feb 17, 2015
7c65c36
Merge pull request #349 from Nutbolt52/patch-1
eve-seat Feb 18, 2015
a5278c4
Small typo fixes
eve-seat Feb 18, 2015
66fc1c9
Follow user settings for number formats
mglinski Feb 18, 2015
3c0d79c
Fix whitespace
mglinski Feb 18, 2015
d52abd5
Merge pull request #1 from mglinski/patch-1
mglinski Feb 19, 2015
e05e2a4
Add Corp Wallet Totals to homepage
mglinski Feb 19, 2015
f18f343
Fix SQL query bug
mglinski Feb 19, 2015
6f3cc31
Add Corporation Overview/Dashboard List
mglinski Feb 19, 2015
0823b97
Fix SQL
mglinski Feb 19, 2015
6776657
bugfix
mglinski Feb 19, 2015
ebc2bac
Remove reference to $character in corporation@viewAll
mglinski Feb 19, 2015
54402b8
Add corporation sheet to SQL return
mglinski Feb 19, 2015
c69d2ab
Fix order of joins
mglinski Feb 19, 2015
de664dd
Fix image extensions
mglinski Feb 19, 2015
22612e6
Add member count
mglinski Feb 19, 2015
a8cf459
Rename Sidebar Link
mglinski Feb 19, 2015
6dd2395
Removed URL
mglinski Feb 19, 2015
9a6be05
Change Corporation Icon on dashboard
mglinski Feb 19, 2015
f885de6
Merge pull request #354 from Nutbolt52/avatarquality
eve-seat Feb 21, 2015
9d81948
Merge pull request #355 from mglinski/dev
eve-seat Feb 21, 2015
3a5aec4
Small wording and indenting fix
eve-seat Feb 21, 2015
44811c7
Add contact information fixing #350
eve-seat Feb 21, 2015
423f6d1
Fix #344 by increasing the permissions field size
eve-seat Feb 21, 2015
ba48673
Fix thousand_seperator and decimal_seperator for #345
eve-seat Feb 21, 2015
457c817
Settings Cache using Cache system
mglinski Feb 23, 2015
26b5d54
Fix namespace resolution
mglinski Feb 23, 2015
24abcc2
Moar bug fixes omg
mglinski Feb 23, 2015
50e7e95
Sort Corporation List by Name and not order of key insert.
mglinski Feb 23, 2015
6b9857a
Calculate the actual time an IP address is banned on the API, and use…
mglinski Feb 24, 2015
e305e17
Fix Whitespace
mglinski Feb 26, 2015
b35e21c
Fix comment whitespace
mglinski Feb 26, 2015
f10d834
Fix whitespace rules
mglinski Feb 26, 2015
131c311
Adding in support for Thera stations, both Character and Corp
kunnis Feb 27, 2015
be34c73
Merge pull request #363 from mglinski/fix-key-ban-timer
eve-seat Feb 28, 2015
c5dc066
Merge pull request #358 from mglinski/cache-app-settings
eve-seat Feb 28, 2015
5f4697f
Fixup formatting and add comments
eve-seat Feb 28, 2015
3803857
Merge pull request #360 from mglinski/update-corp-list-order
eve-seat Feb 28, 2015
ece4faa
Fix up whitespace
eve-seat Feb 28, 2015
df361a6
Merge pull request #365 from kunnis/theraLocations
eve-seat Feb 28, 2015
2c8299f
Remove # of downloads badge. This means nothing.
eve-seat Feb 28, 2015
d9d84f2
Add some user defined settings for SeAT notifications.
eve-seat Feb 28, 2015
92b0900
Lazy Load All Images in Seat
mglinski Mar 1, 2015
7373a55
Fix calls of Cache::set() to Cache::put()
mglinski Feb 24, 2015
5463d7e
Merge pull request #362 from mglinski/fix-cache-options
eve-seat Mar 1, 2015
0cb59bb
Fix queue push to use valid class names
mglinski Mar 1, 2015
a6b662b
Merge pull request #366 from mglinski/lazy-load-images-new
eve-seat Mar 1, 2015
61f61a9
Merge pull request #367 from mglinski/fix-queue-passing
eve-seat Mar 1, 2015
1ef2fb7
Grr. Add comments, fix formatting, fix whitespace, fix trailing newlines
eve-seat Mar 1, 2015
a859e88
Fixing a divide by zero situation. See eve-seat/seat#353
kunnis Mar 1, 2015
2bbfae2
Minor typo fixes
Zumochi Mar 2, 2015
2f71726
Merge pull request #369 from kunnis/fixDivideByZeroOnHanger
eve-seat Mar 2, 2015
f5c4918
Merge pull request #371 from Zumochi/patch-1
eve-seat Mar 2, 2015
bdb4e7a
Minor comment format fix
eve-seat Mar 2, 2015
b6f7106
aaaaa fix broken indentation. Indent is 4 spaces NOT tabs
eve-seat Mar 2, 2015
dcadb24
Fix external eve site images to they are not autoloaded
mglinski Mar 2, 2015
4bd3f13
Fix #368 by updating the SQL
eve-seat Mar 4, 2015
4a4b044
Merge pull request #372 from mglinski/fix-external-eve-site-images
eve-seat Mar 5, 2015
cbac397
Increase alt portrait image size
eve-seat Mar 5, 2015
8b6c7d3
Disable lazy loading for the profile image
eve-seat Mar 5, 2015
5dd34f8
Version Bump
eve-seat Mar 5, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix thousand_seperator and decimal_seperator for #345
  • Loading branch information
eve-seat committed Feb 21, 2015
commit ba4867386ba80860684e0db072597e27461573be
12 changes: 6 additions & 6 deletions app/services/validators/SeatSettingValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ class SettingValidator extends Validator

public static $rules = array(
'app_name' => 'required',
'registration_enabled' => 'required',
'required_mask' => 'required|numeric|min:176693568',
'administrative_contact' => 'required|email',
'color_scheme' => 'required|in:blue,black',
'thousand_seperator' => 'required',
'decimal_seperator' => 'required',
'registration_enabled' => 'required',
'required_mask' => 'required|numeric|min:176693568',
'administrative_contact' => 'required|email',
'color_scheme' => 'required|in:blue,black',
'thousand_seperator' => 'in:" ",",","."|size:1',
'decimal_seperator' => 'required|in:",","."|size:1',
'seatscheduled_character' => 'required|in:true,false',
'seatscheduled_corporation' => 'required|in:true,false',
'seatscheduled_corporation_assets' => 'required|in:true,false',
Expand Down
4 changes: 3 additions & 1 deletion app/services/validators/SeatUserSettingValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ class UserSettingValidator extends Validator
{

public static $rules = array(
'color_scheme' => 'required|in:blue,black',
'color_scheme' => 'required|in:blue,black',
'main_character_id' => 'required|numeric',
'email_notifications' => 'required|in:true,false',
'thousand_seperator' => 'in:" ",",","."|size:1',
'decimal_seperator' => 'required|in:",","."|size:1',
);
}