a33435ee12
No seriously. Fuck you, MySQL strict.
2013-11-26 17:47:21 -05:00
eb7801abf9
Fuck you, MySQL strict mode. Right in the eye.
2013-11-26 17:36:06 -05:00
42450d9cd6
Merge branch 'refs/heads/master' into develop
2013-11-26 17:24:05 -05:00
4c0af1eae1
Fixed typo causing failure with mysql strict
2013-11-26 17:22:40 -05:00
35e5df8bdc
Merge branch 'refs/heads/develop'
2013-11-26 16:51:44 -05:00
dfd374b875
Removed optional from db seed
2013-11-26 16:51:23 -05:00
7722c50312
Merge branch 'refs/heads/develop'
2013-11-26 16:37:09 -05:00
1527b88fd6
Fixes #61
2013-11-26 16:36:42 -05:00
7f82a6e9fa
Merge branch 'refs/heads/develop'
2013-11-26 14:55:49 -05:00
196710dac8
Fixed bug in error validation display
2013-11-26 14:55:04 -05:00
194c0b6c7b
Implemented new alpha_space validation
2013-11-26 14:54:46 -05:00
b3b67abaa0
New alpha_space custom validation
2013-11-26 14:08:17 -05:00
0f0059342c
CSRF routing
...
Not sure if this method will work
2013-11-26 12:49:04 -05:00
d7a8cac1dc
Fixed validation
2013-11-26 12:46:23 -05:00
c8288b430e
Merge branch 'refs/heads/develop'
2013-11-26 11:57:39 -05:00
dc5ad87686
Fixes #59
2013-11-26 11:57:14 -05:00
1ff93f65b3
Merge branch 'refs/heads/develop'
2013-11-26 07:29:08 -05:00
4ccb93665b
Sexy typeahead select2 boxes for license and asset checkout
2013-11-26 07:28:47 -05:00
32a63cdd56
Switched asset->id to license->id
2013-11-26 07:26:07 -05:00
635cd71ef7
Herp-derp. Braces.
2013-11-26 07:23:47 -05:00
116af7e809
Merge branch 'refs/heads/develop'
2013-11-26 07:12:14 -05:00
ee3fb2785e
Fixed XSS on modal
...
Weird thing. The values were being escaped on the way out but something in the modal javascript was parsing them out as if they weren't. Using data-html="false" seemed to have no effect on the modal. *shrug* Problem for another time.
2013-11-26 07:05:04 -05:00
2b1ddd9a45
Escaping HTML in modal title
2013-11-26 06:58:14 -05:00
1fe925ad5f
Removing alpha_dash
2013-11-26 06:56:54 -05:00
c220c0a427
Alpha_dash is too contrictive
2013-11-26 06:56:20 -05:00
52fa847769
Updated to prevent the XSS in the menu
2013-11-26 06:20:46 -05:00
9854752036
Don't need it
2013-11-26 04:45:11 -05:00
37fd854003
Merge branch 'refs/heads/develop'
2013-11-26 03:13:33 -05:00
e6fc1956fc
Fixes #55
2013-11-26 03:13:09 -05:00
5bf38b1d02
Fixes #50
2013-11-26 02:33:16 -05:00
5b8adda5da
Merge branch 'refs/heads/develop'
2013-11-26 02:14:31 -05:00
d0cbb9f3a7
Fixes #52
2013-11-26 02:14:06 -05:00
1295855302
Fixes #51
2013-11-26 02:12:32 -05:00
4d1dd1c446
Fixed #50 - MOAR VALIDATION!
2013-11-26 02:09:37 -05:00
e77b47717e
More validation
2013-11-26 02:04:29 -05:00
3f4ce4025f
Tighter data validation on name
2013-11-26 01:58:57 -05:00
680b377bd1
Validation on price
2013-11-26 01:28:45 -05:00
45c04b1cde
Fixed display bug
2013-11-26 01:27:27 -05:00
e13578d97d
Fixed error when no category is given
2013-11-26 01:21:55 -05:00
1d50724c91
Removed parent from category
...
Since the field was already removed
2013-11-26 01:15:25 -05:00
d469a9601b
Merge branch 'refs/heads/develop'
2013-11-25 19:57:40 -05:00
fa246aade1
Removed line thingie
2013-11-25 19:57:28 -05:00
a27be4e053
Merge branch 'refs/heads/develop'
2013-11-25 19:56:41 -05:00
7e6013b125
Added seat numbers
2013-11-25 19:56:22 -05:00
e310d16fb7
Merge branch 'refs/heads/develop'
2013-11-25 18:33:53 -05:00
6b224ea8aa
Removed dummy text
2013-11-25 18:33:27 -05:00
7a5b133c58
Fixed bug linking to assets when they should be pointing to licenses
2013-11-25 18:31:59 -05:00
4e25a9e815
Removed extra columns
2013-11-25 18:31:44 -05:00
084ec064cb
Removed created_at from listing. Not important enough to waste the screen space on
2013-11-25 13:38:14 -05:00
0eb86ccd1d
Merge branch 'refs/heads/develop'
2013-11-25 13:35:32 -05:00
snipe