DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 19:14:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12044 commits 96 branches 267 tags 296 MiB
Commit graph

12044 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 4998b5ab1b Fixes #2080 2016-06-02 00:15:38 -07:00
snipe 368bb77cf0 Merge pull request #2102 from dmeltzer/layout-fixes 
Improve navbar/header layout
 2016-06-01 21:25:40 -07:00
Daniel Meltzer 37b416d5c7 Fix my git terrribleness. 2016-06-01 23:00:29 -05:00
Daniel Meltzer c7e695d3fe Revert "Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list" 
This reverts commit 9c77de6473.
 2016-06-01 22:55:37 -05:00
Daniel Meltzer a152b0ae54 Center the logo text on small screens. It's looking more reasonable by the week... 2016-06-01 22:52:25 -05:00
Daniel Meltzer 9c77de6473 Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list 2016-06-01 22:41:11 -05:00
Daniel Meltzer 71ca17649c Improvements? 2016-06-01 22:30:12 -05:00
Daniel Meltzer 41f3d5ccbc Add new css file 2016-06-01 21:42:48 -05:00
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