 Vincent Sposato
|
41127bf5dd
|
Added scope to the Asset model to pull all assets that belonged to a list of models
|
2015-08-01 12:14:21 -04:00 |
|
|
Vincent Sposato
|
64bff852bd
|
Added a scope to the Model model to allow for selecting only models that belong to a list of categories
|
2015-08-01 12:14:20 -04:00 |
|
|
snipe
|
37d4a0105e
|
Fix for strict mode
|
2015-07-31 11:15:17 -07:00 |
|
|
snipe
|
3bb296db78
|
Fixed language string for notes (when the hell did THAT break?)
|
2015-07-30 15:10:59 -07:00 |
|
|
snipe
|
305c22f72d
|
Added request to dashboard
|
2015-07-30 14:59:24 -07:00 |
|
|
snipe
|
9f81792e70
|
Request button strings
|
2015-07-30 14:52:55 -07:00 |
|
|
snipe
|
57e21193c9
|
Added language strings for not requestable
|
2015-07-30 14:50:06 -07:00 |
|
|
snipe
|
ce9d728c2d
|
Updated controller to make sure the asset exists and is requestable
|
2015-07-30 14:48:32 -07:00 |
|
|
snipe
|
6bc2128c3e
|
Added requestable button
|
2015-07-30 14:48:19 -07:00 |
|
|
snipe
|
78835a8b1f
|
Add requestable as bulk-edit option
|
2015-07-30 14:32:25 -07:00 |
|
|
snipe
|
39da217a9e
|
Fixed table nane for asset_logs in migration
|
2015-07-29 22:47:24 -07:00 |
|
|
snipe
|
948c443829
|
Fix for edit/clone
|
2015-07-29 20:50:23 -07:00 |
|
|
snipe
|
1a3bf10753
|
Merge pull request #989 from vsposato/feature/865_ThreadIdAddition
Feature/865 thread id addition
|
2015-07-29 16:22:19 -07:00 |
|
|
Vincent Sposato
|
7876ae462c
|
Added the migration for the thread_id on the asset_logs table
Added the relationships for the self-referential links on thread_id
|
2015-07-29 19:16:57 -04:00 |
|
|
Vincent Sposato
|
ad6cec080c
|
Merge branch '2.0' of https://github.com/snipe/snipe-it into 2.0
|
2015-07-29 19:04:51 -04:00 |
|
|
snipe
|
028cde8738
|
Merge pull request #987 from mdaniels5757/2.0
Added Code128 Label Compatibility (to 2.0)
|
2015-07-29 12:06:14 -07:00 |
|
|
Michael Daniels
|
20f94ce418
|
Closing brackets are helpful
|
2015-07-29 14:27:03 -04:00 |
|
|
Michael Daniels
|
cced7a93a5
|
Update AssetsController.php
|
2015-07-29 14:25:49 -04:00 |
|
|
Michael Daniels
|
6430f7a4a7
|
Update AssetsController.php
|
2015-07-29 14:24:30 -04:00 |
|
|
Michael Daniels
|
1fff9f6048
|
Update macros.php
|
2015-07-29 14:23:17 -04:00 |
|
|
Michael Daniels
|
85a9f1b71f
|
Merge pull request #1 from snipe/2.0
2.0
|
2015-07-29 14:21:57 -04:00 |
|
|
snipe
|
480fd78c51
|
Disllow delete if parent
|
2015-07-28 20:45:32 -07:00 |
|
|
snipe
|
0c9018289b
|
Fixes #970
|
2015-07-28 20:24:58 -07:00 |
|
|
snipe
|
65bf156da1
|
Better spacing for modal for elements
|
2015-07-28 18:40:06 -07:00 |
|
|
snipe
|
a8624a736d
|
Merge pull request #983 from madd15/patch-1
Fix #972 - Change back button to work
|
2015-07-28 17:59:59 -07:00 |
|
|
madd15
|
c1ae844308
|
Fix #972 - Change back button to work
|
2015-07-29 10:13:18 +09:30 |
|
|
snipe
|
bb450e6bb6
|
Merge pull request #980 from snipe/inline_layout_fix
Fix to nicen up the layout for the inline-adding and Bootstrapify it.
|
2015-07-28 14:39:12 -07:00 |
|
|
Brady Wetherington
|
20eb2df9be
|
Fix to nicen up the layout for the inline-adding and Bootstrapify it.
|
2015-07-28 14:25:47 -07:00 |
|
|
snipe
|
1e38ced885
|
Nicer display of "add new" inline functionality.
TODO:
Handle validation failures in a less fugly way
|
2015-07-28 11:58:45 -07:00 |
|
|
snipe
|
fe2fb63007
|
Localization strings for inline modals
|
2015-07-28 11:31:08 -07:00 |
|
|
snipe
|
b79841d481
|
Fix for @uberbrady's missing route on inline adding
|
2015-07-28 11:18:18 -07:00 |
|
|
snipe
|
e4ad1011da
|
Merge pull request #969 from snipe/inline_adding
Inline adding of dependent drop-down contents on asset-creation
|
2015-07-27 23:39:07 -07:00 |
|
|
Brady Wetherington
|
de8180ec70
|
Abililty to inline-add things when you are creating a new asset
|
2015-07-27 23:27:45 -07:00 |
|
|
snipe
|
80145c699e
|
One more because I have teh dumb and cannot brain today
|
2015-07-27 18:18:41 -07:00 |
|
|
snipe
|
f99cafc101
|
Fix for 0000-00-00 purchase date
|
2015-07-27 17:16:28 -07:00 |
|
|
snipe
|
4014f5e15b
|
Bug in purchase date
|
2015-07-27 17:11:46 -07:00 |
|
|
snipe
|
fdb31ac19e
|
Small tweaks to import script
|
2015-07-27 16:50:14 -07:00 |
|
|
snipe
|
9184dd5303
|
Fix for sad action column with button wrapping
|
2015-07-27 15:28:41 -07:00 |
|
|
snipe
|
26e081a2cb
|
Fixes #909 again, because math is super hard
|
2015-07-27 15:26:53 -07:00 |
|
|
snipe
|
66a198a175
|
Merge pull request #966 from madd15/patch-2
Request #961 - Clone button on license list view
|
2015-07-27 15:07:52 -07:00 |
|
|
madd15
|
7aba5f3a84
|
Request #961 - Clone button on license list view
|
2015-07-28 07:33:51 +09:30 |
|
|
snipe
|
8d48fddac4
|
Merge pull request #956 from madd15/patch-1
Fix missing ]
|
2015-07-27 10:27:53 -07:00 |
|
|
snipe
|
8b5de894df
|
Updated language files
|
2015-07-27 10:24:21 -07:00 |
|
|
snipe
|
5781a01311
|
Added English, Indonesian
|
2015-07-27 10:24:08 -07:00 |
|
|
snipe
|
de1adf227b
|
New language files
|
2015-07-27 10:18:40 -07:00 |
|
|
madd15
|
5e7bfe314a
|
Fix missing ]
|
2015-07-27 21:20:19 +09:30 |
|
|
snipe
|
08ce08db62
|
Missing language strings for accept/decline
|
2015-07-26 23:01:31 -07:00 |
|
|
snipe
|
56504e07c9
|
More consistent language
|
2015-07-26 22:55:09 -07:00 |
|
|
snipe
|
a901a648af
|
Fixes #875 - allow user to decline asset and check asset back in if declined
|
2015-07-26 22:53:48 -07:00 |
|
|
snipe
|
a099d16714
|
Only send email if an email address was given
|
2015-07-26 22:08:26 -07:00 |
|