Daniel Meltzer
e32d5490d3
Add updated gulp css for testing. Probably revert before merge.
2016-06-01 21:39:49 -05:00
Daniel Meltzer
d85d3b14f7
More layout fixes for small devices.
2016-06-01 21:37:03 -05:00
snipe
1daa6abf48
Merge pull request #2101 from dmeltzer/importer-again
...
Case insensitive string comparison for items when importing
2016-06-01 18:13:02 -07:00
Daniel Meltzer
5d206f2c20
Fix navbar spacing on screen and mobile. Move the items on the left of the navbar to their own list. Style fixes. Move breadcrumb to outside navbar because it was breaking things and I think it looks better
2016-06-01 20:10:19 -05:00
Daniel Meltzer
2ff1ee4d33
Fix some indentaiton and a missing tag, no functionality changes here.
2016-06-01 20:10:19 -05:00
snipe
04610e7864
Just use model validation for new user
2016-06-01 18:04:11 -07:00
Daniel Meltzer
da01591ab8
Case insensitive string comparison for items when comparing with existing items. Fixes some false errors. Also remove stray characters from manufacturer logging.
2016-06-01 19:31:24 -05:00
snipe
cffa76e627
Find first record, instead of hardcoded id 1
2016-06-01 15:50:50 -07:00
snipe
9c4cd9c3ce
Save email/username format in settings controller
2016-06-01 15:45:26 -07:00
snipe
eacf70ee3f
Updated validation
2016-06-01 15:45:05 -07:00
snipe
33a35ec7f5
Migration for for email/username format settings
2016-06-01 15:44:37 -07:00
snipe
e0c07d8921
Language strings for email/username format
2016-06-01 15:44:29 -07:00
snipe
99f6207a69
Added macro for email/username format
2016-06-01 15:44:16 -07:00
snipe
d786be4fc0
Use local fontawesome and added select2
2016-06-01 15:43:55 -07:00
snipe
8a7a659a87
Added email domain, email format and username format to settings/setup form
2016-06-01 15:43:39 -07:00
snipe
f3c6275f8d
Removed settings form request
2016-06-01 15:43:12 -07:00
snipe
0a2fb2ace7
Merge pull request #2099 from dmeltzer/sqlite-fixes
...
Fix a regression in Helper::usersList and ::managerList()
2016-06-01 11:49:51 -07:00
Daniel Meltzer
1c1ef951e9
Fix a regression in Helper::usersList and ::managerList() where the "Select a User" option disappeared. Also format names the way they used to be formatted.
2016-06-01 13:47:46 -05:00
snipe
45d3d90c94
Merge pull request #2067 from dmeltzer/ajax-mobile-upload-PR
...
Mobile-Friendly image capture/upload + Ajax rewrite of asset create
2016-06-01 11:34:42 -07:00
snipe
a9870db83f
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-05-31 21:16:40 -07:00
snipe
697ed0d53c
Fixes UAT for User
...
Needed to specify form name to prevent focus in asset tag search from being submitted
2016-05-31 21:16:30 -07:00
Daniel Meltzer
3ddaa88694
Fix image processing when editing an existing asset. Also reenable the image scaling on the server, but boost limit to 800x800
2016-05-31 19:50:58 -05:00
Daniel Meltzer
b3454b1c24
Fix bug in image process logic that wouldn't resize the height. Also make it possible to choose files from android as well as pictures directly.
2016-05-31 19:50:58 -05:00
Daniel Meltzer
fcc79456fd
Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff
2016-05-31 19:50:58 -05:00
snipe
11c400f12b
Merge pull request #2095 from dmeltzer/importer-improvements
...
Reduce Import error warnings in importer.
2016-05-31 17:45:29 -07:00
snipe
823273f565
Merge pull request #2092 from dmeltzer/installer
...
Fix installer for v3. Tested with centos7 and ubuntu 16.4.
2016-05-31 17:45:18 -07:00
snipe
a542b18a04
Merge pull request #2050 from dmeltzer/sqlite-fixes
...
Sqlite fixes
2016-05-31 17:45:04 -07:00
Daniel Meltzer
f2a5337ad2
Simplify
2016-05-31 19:41:14 -05:00
Daniel Meltzer
4af5cdd64f
asset_id is not allowed to be null in asset_log according to db schema. 0 it out here to make sqlite happy.
2016-05-31 19:41:14 -05:00
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
Daniel Meltzer
a729038ccd
Fix typo.
2016-05-31 19:00:11 -05:00
Daniel Meltzer
e5bd6a8a26
A bit more detailed message when starting the installer to share what version of OS we've detected.
2016-05-31 18:51:56 -05:00
Daniel Meltzer
5e03fe40a7
Fix some more centos6 stuff.
...
Fix for detecting centos6. Not ideal, but hopefully no one has a fresh install of centos5 lying around..
Also fix some issues with code not being ported in the centos6 section.
2016-05-31 18:45:07 -05:00
Daniel Meltzer
dab2a50982
Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements.
2016-05-31 18:04:01 -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
5952181454
Fix missing -p in mysql call on centos6.
2016-05-31 09:05:51 -05:00
Daniel Meltzer
0da1e186d7
Fix some weird bash issues caused when merging the v2 and v3 versions of the script.
2016-05-29 15:54:20 -05:00
Daniel Meltzer
d92de14413
Fix installer for v3. Tested with centos7 and ubuntu 16.0.4.
...
This essentially just changes the configuration section to work with the
new .env file, and leaves almost everything else alone. Some
reordering of code did occur to try and fix a number of issues I
encountered along the way. This still really needs to be rewritten to
only run what it should as root, and not everything, but that should get
more testing than there is between now and v3.
One thing to note: This changes fetching master.zip to the v3 alpha2
tag, for obviousish reasons. Once master goes back to v3, or there is a
way of downloading a v3 tarball on a regular basis, it should be changed
to do that again.
2016-05-28 20:35:28 -05: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
