Daniel Meltzer
|
0fa82743a1
|
Remove remaining DB::Raw(concat) calls to make things more sqlite friendly. This adds one new method to the Asset Model to return the formatted string that was used by the license and asset maintence controller. It also fixes a potential sqlite-only issue where '' and null are different.
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
45d93ffa8c
|
Use a transaction while creating license seats. Makes adding a license with a large number of seats much more managable.
|
2016-05-31 19:41:14 -05:00 |
|
Daniel Meltzer
|
4b98711e07
|
Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly
|
2016-05-31 19:41:14 -05:00 |
|
snipe
|
0e0b31bba6
|
Company name length to 1
|
2016-05-31 15:04:13 -07:00 |
|
snipe
|
c9d00b1f06
|
Merge branch 'v3' of github.com:snipe/snipe-it into v3
|
2016-05-31 14:27:39 -07:00 |
|
snipe
|
9bb258bb99
|
Updated alt tag
|
2016-05-31 14:27:33 -07:00 |
|
snipe
|
ac10a199ea
|
Merge pull request #2083 from dmeltzer/importer-improvements
Importer improvements
|
2016-05-31 14:25:33 -07:00 |
|
Daniel Meltzer
|
004c63cd5d
|
Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification.
|
2016-05-26 21:29:29 -05:00 |
|
Daniel Meltzer
|
715e385925
|
Two things. One, try to make the import uploads directory if it doesn't exist. Two, call the object importer instead of the old asset importer. TODO: Feed output from object importer back to import page.
|
2016-05-26 08:00:00 -05:00 |
|
Daniel Meltzer
|
891c37b2ed
|
Add warranty months. Also fix a merge issue where things reverted back to comment instead of log.
|
2016-05-25 21:13:26 -05:00 |
|
Daniel Meltzer
|
e353df588f
|
Importer improvements. If user real name doesn't exist don't try to create the user.
|
2016-05-25 20:47:46 -05:00 |
|
Daniel Meltzer
|
fd0d04eba4
|
Import status labels.
|
2016-05-25 20:46:01 -05:00 |
|
Daniel Meltzer
|
22c6f32e92
|
Instead of a field in the csv, set whether assets, consumables, or accessories are generated by an option on the command line. Also Adjustconsumables/accessories to function smoother.
|
2016-05-25 20:37:19 -05:00 |
|
Daniel Meltzer
|
04428d2d07
|
Replace console output in ObjectImporter with a logging mechanism. Also track all model/validation errors and output them at the end of the import, rather than inline.
|
2016-05-25 20:37:19 -05:00 |
|
snipe
|
c89f357e4a
|
Fixes #2082
LOL whoops
|
2016-05-25 13:32:33 -07:00 |
|
snipe
|
8a968b4dfb
|
Responsive dashboard table
|
2016-05-24 19:04:56 -07:00 |
|
snipe
|
9aff515c0a
|
More mobile fixes
|
2016-05-24 18:50:54 -07:00 |
|
snipe
|
5f91329397
|
Some responsive fixes
Still needs work tho :(
|
2016-05-24 17:59:02 -07:00 |
|
snipe
|
37be587c39
|
Make regular and highlight colors the same, since we're not using highlight colors in the pie chart yet
|
2016-05-24 16:19:44 -07:00 |
|
snipe
|
0c33575962
|
Merge branch 'v3' of github.com:snipe/snipe-it into v3
|
2016-05-24 16:10:45 -07:00 |
|
snipe
|
84edc9cf25
|
New generated JS
|
2016-05-24 16:10:04 -07:00 |
|
snipe
|
14dac9b371
|
Updated versioned js
|
2016-05-24 16:09:37 -07:00 |
|
snipe
|
8e18d02f7a
|
Updated chartJS
|
2016-05-24 16:09:28 -07:00 |
|
snipe
|
d0ebdd03bd
|
Added legend template for chartJS, even though it doesn't seem to do a fucking thing
|
2016-05-24 16:08:56 -07:00 |
|
snipe
|
bfc3f69adb
|
Better comments on model methods
|
2016-05-24 16:08:18 -07:00 |
|
snipe
|
cde0d49e18
|
Added assets method
|
2016-05-24 16:06:22 -07:00 |
|
snipe
|
abf027059f
|
Fixed comment
|
2016-05-24 16:06:15 -07:00 |
|
snipe
|
4edc2a7a66
|
Route and controller for dashboard chart
|
2016-05-24 16:06:09 -07:00 |
|
snipe
|
3b838ca867
|
Added static colors for charts
|
2016-05-24 16:05:51 -07:00 |
|
snipe
|
8b023adba3
|
Merge pull request #2078 from dmeltzer/fix-statuslabels-translations
Fix strings for StatusLabels, they still referenced locations.
|
2016-05-24 15:56:10 -07:00 |
|
Daniel Meltzer
|
293b8c0dea
|
Fix strings for StatusLabels, they still referenced locations.
|
2016-05-24 17:54:44 -05:00 |
|
snipe
|
d6dc57286f
|
Merge pull request #2077 from dmeltzer/fix-settings-table-for-sqlite
Fix (for real this time?) the settings table option_name/option_value
|
2016-05-24 15:45:25 -07:00 |
|
Daniel Meltzer
|
52b61c9d49
|
Fix mistake in the settings table kerfuffle.
|
2016-05-24 17:41:59 -05:00 |
|
snipe
|
780c0e678d
|
Changed min dimensions to 500 from 300
|
2016-05-24 13:21:18 -07:00 |
|
snipe
|
5bceb5ce52
|
Display escaped parsedown note
|
2016-05-24 10:21:45 -07:00 |
|
snipe
|
de5e1ca86b
|
Add persedown helper
|
2016-05-24 10:21:33 -07:00 |
|
snipe
|
6c6e65b8ca
|
Fixes #2076
|
2016-05-24 09:46:43 -07:00 |
|
snipe
|
64d818e56e
|
Fixed License and LicenseSeat namespaces for importer
|
2016-05-24 02:17:10 -07:00 |
|
snipe
|
d6715914e1
|
Fixed supplier namespace
|
2016-05-24 02:13:28 -07:00 |
|
snipe
|
f10b3b7cdb
|
Fix for license importer
|
2016-05-24 01:51:47 -07:00 |
|
snipe
|
f844bf4b41
|
Nicer focus handling for asset search
|
2016-05-24 01:10:05 -07:00 |
|
snipe
|
6e006a6873
|
Redundant top nav
|
2016-05-24 00:58:59 -07:00 |
|
snipe
|
cb91829729
|
Fixed division by zero error
|
2016-05-24 00:49:56 -07:00 |
|
snipe
|
fb35e40342
|
Search by asset tag
Compatible with barcode scanners
|
2016-05-20 17:02:28 -07:00 |
|
snipe
|
b796e72faf
|
Remove old search
|
2016-05-20 16:01:23 -07:00 |
|
snipe
|
c56ceebb40
|
Default timezone back to UTC
|
2016-05-20 14:29:15 -07:00 |
|
snipe
|
78fc6dec3c
|
Merge branch 'v3' of github.com:snipe/snipe-it into v3
|
2016-05-20 12:23:36 -07:00 |
|
snipe
|
7fd6051514
|
Fixes #2062 - old permissions masks to new
|
2016-05-20 12:23:31 -07:00 |
|
snipe
|
072923826d
|
Merge pull request #2060 from dmeltzer/fix-settings-table-for-sqlite
Fix updates from v2
|
2016-05-20 10:52:00 -07:00 |
|
Daniel Meltzer
|
c52e3b5f9c
|
Check if the column exists before dropping. Also recreate the column in a rollback to make the migrations happy. Also break into two migrations to make sqlite happy.
|
2016-05-20 10:03:04 -05:00 |
|