 Gil Rutkowski
|
71eaeb2783
|
Updated README for Environments and revised the order of things.
|
2013-11-29 23:56:48 -06:00 |
|
|
Gil Rutkowski
|
f9d8cb1b93
|
Made things a bit more environmentally sensitive.
|
2013-11-29 23:22:48 -06:00 |
|
|
Gil Rutkowski
|
2e82794ab4
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2013-11-29 15:45:41 -06:00 |
|
|
snipe
|
7142e37372
|
Deleted users
|
2013-11-29 16:44:48 -05:00 |
|
|
snipe
|
dca7a7f2eb
|
Allow deleted users
|
2013-11-29 16:39:24 -05:00 |
|
|
snipe
|
a7ca9f0c9f
|
Layout tweaks
|
2013-11-29 16:36:11 -05:00 |
|
|
Gil Rutkowski
|
7c3a9faf53
|
Updating from upstream
Merge remote-tracking branch 'upstream/develop' into develop
|
2013-11-29 15:20:28 -06:00 |
|
|
Gil Rutkowski
|
2fe58f8d6d
|
Merge branch 'patch-1' of github.com:flashingcursor/snipe-it into develop
|
2013-11-29 15:16:01 -06:00 |
|
|
snipe
|
bc16276a38
|
Merge pull request #96 from flashingcursor/patch-1
Removed post-install-cmd php artisan optimize.
|
2013-11-29 13:10:47 -08:00 |
|
|
snipe
|
11c657ffa4
|
Fixes #36
|
2013-11-29 16:08:18 -05:00 |
|
|
snipe
|
80afa7cbc7
|
Disallow checkout of undeployable items
|
2013-11-29 15:27:44 -05:00 |
|
|
snipe
|
56adc67e67
|
Require manufacturer ID
|
2013-11-29 15:21:11 -05:00 |
|
|
snipe
|
02f1977d30
|
Fixed error message
|
2013-11-29 15:20:29 -05:00 |
|
|
snipe
|
b68e39472d
|
Updating to bootstrap 3
|
2013-11-29 15:19:00 -05:00 |
|
|
snipe
|
10df2bc950
|
Bootstrap 3
|
2013-11-29 14:46:38 -05:00 |
|
|
Gil Rutkowski
|
f6aecd8af9
|
Removed post-install-cmd php artisan optimize. Causes initial install to fail due to lack of required config (mail.php)
|
2013-11-29 14:37:44 -05:00 |
|
|
snipe
|
567f395afa
|
More fixes for #88
|
2013-11-29 14:37:06 -05:00 |
|
|
snipe
|
7003eff42c
|
More fixes for #88
|
2013-11-29 14:36:46 -05:00 |
|
|
snipe
|
d54eb94497
|
Improved layout
|
2013-11-29 14:35:24 -05:00 |
|
|
Gil Rutkowski
|
295cef61df
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2013-11-29 12:52:03 -06:00 |
|
|
Gil Rutkowski
|
8ed5584565
|
Removed post-install artisan optimize from composer.json — this breaks first time install as a mail config doesn’t exist yet.
|
2013-11-29 12:42:14 -06:00 |
|
|
snipe
|
e305099b45
|
Fixed model view
|
2013-11-29 09:52:51 -05:00 |
|
|
snipe
|
091de54bab
|
BS3 error validation text
|
2013-11-29 09:45:30 -05:00 |
|
|
snipe
|
112d5d5994
|
Style change - removed underline from header
|
2013-11-29 09:35:51 -05:00 |
|
|
snipe
|
428998c6fb
|
Prettier buttons
|
2013-11-29 09:32:10 -05:00 |
|
|
snipe
|
56b52392e8
|
honor user soft-deletes
|
2013-11-29 09:28:45 -05:00 |
|
|
snipe
|
ddf0997a93
|
Signin BS3
|
2013-11-29 09:05:30 -05:00 |
|
|
snipe
|
3544be0960
|
Merge branch 'refs/heads/feature-bootstrap3' into develop
|
2013-11-29 08:41:24 -05:00 |
|
|
snipe
|
2e916d0246
|
MOAR BOOTSTRAP
|
2013-11-29 08:39:10 -05:00 |
|
|
snipe
|
809e176908
|
Updating for bootstrap3
|
2013-11-29 07:39:41 -05:00 |
|
|
snipe
|
c2bf033fb8
|
More form/button class changes
|
2013-11-29 07:11:33 -05:00 |
|
|
snipe
|
d67c01e652
|
Whitespace
|
2013-11-29 05:21:00 -05:00 |
|
|
snipe
|
8d82338e1e
|
Remove underline from stats blocks
|
2013-11-29 05:20:49 -05:00 |
|
|
snipe
|
89e6f52142
|
More bootstrap 3
|
2013-11-29 05:15:51 -05:00 |
|
|
snipe
|
030db6e267
|
Upgrading to bootstrap 3
Ugh.
|
2013-11-29 04:10:25 -05:00 |
|
|
snipe
|
06cbd0723e
|
Fixes #93
|
2013-11-28 23:32:44 -05:00 |
|
|
snipe
|
839d01a3af
|
Fixed relationship method because fuck you ORM
|
2013-11-28 20:58:40 -05:00 |
|
|
snipe
|
4d421c9a50
|
Leftover method that's not used since the license/asset split
|
2013-11-28 20:58:15 -05:00 |
|
|
snipe
|
9fa826b2e7
|
Fixed assigned to id
|
2013-11-28 20:40:02 -05:00 |
|
|
snipe
|
7718e8d928
|
Checks that checkedout_to isn't 0 before trying to get fullName()
|
2013-11-28 20:28:09 -05:00 |
|
|
snipe
|
23374b7fc6
|
Another leftover from #88
|
2013-11-28 20:27:44 -05:00 |
|
|
snipe
|
f0f07b578b
|
Fixing pivot for users
|
2013-11-28 20:19:23 -05:00 |
|
|
snipe
|
e23f1f10b7
|
Switched validation to alpha_space on notes
|
2013-11-28 20:02:11 -05:00 |
|
|
snipe
|
1b56c31a22
|
Fixed relationship between users/locations because fuck you ORM
|
2013-11-28 19:58:16 -05:00 |
|
|
snipe
|
9f7cbc8a4f
|
Another fix related to #88, also accounts for users with invalid location_ids
|
2013-11-28 19:57:42 -05:00 |
|
|
snipe
|
f504175578
|
Smaller char req for first/last name, longer req for password
|
2013-11-28 19:45:47 -05:00 |
|
|
snipe
|
103faca6ef
|
Clearer display of current vs trashed
|
2013-11-28 19:45:25 -05:00 |
|
|
snipe
|
2fce4884d7
|
Cosmetic changes
|
2013-11-28 19:45:05 -05:00 |
|
|
snipe
|
4142629665
|
Layout tweaks for mobile - related to #54
|
2013-11-28 19:22:39 -05:00 |
|
|
snipe
|
d2959e82a1
|
Redirect to /hardware to finish cleaning up re-routing from #88
|
2013-11-28 18:47:54 -05:00 |
|