a2b353fb6d
Merge branch 'refs/heads/develop'
2013-11-27 02:41:04 -05:00
aa38d83ba6
Fixes #63 and #70
2013-11-27 02:38:16 -05:00
af69467bea
Added notes to log table
2013-11-27 01:29:57 -05:00
432600ab7b
Merge branch 'refs/heads/develop'
2013-11-27 01:21:19 -05:00
b1aa67ddb7
Fixes #69
...
Removed problem migration file
2013-11-27 01:20:57 -05:00
c16382e9d4
Merge branch 'refs/heads/develop'
2013-11-26 22:07:26 -05:00
9f9bb96076
Merge pull request #67 from abrahamvegh/patch-1
...
Patch 1
2013-11-26 18:56:54 -08:00
f1e280ccde
Merge pull request #68 from abrahamvegh/patch-2
...
Fix insecure content warnings
2013-11-26 18:55:14 -08:00
cfe28ad903
Update default.blade.php
...
Remove protocol from Google and jQuery CDN URLs, to fix insecure content warnings in SSL-only environments
2013-11-26 20:33:44 -05:00
bda827c590
Update User.php
...
Fix incorrect Gravatar domain name
2013-11-26 20:19:30 -05:00
ebc40857e4
Update AssetsController.php
...
Fix invalid SQL
2013-11-26 20:15:41 -05:00
69ede7f82c
Merge branch 'refs/heads/develop'
2013-11-26 18:11:00 -05:00
0e3bcfecd0
Should be final fixes for mysql strict mode
2013-11-26 18:10:46 -05:00
96368444ac
Default user id
2013-11-26 17:53:03 -05:00
ec4172d41a
Merge branch 'refs/heads/develop'
2013-11-26 17:49:51 -05:00
8eeae70313
Formatting cleanup
2013-11-26 17:48:51 -05:00
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
snipe