lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Commit graph

  • c1a3592059 Fixes #2130 snipe 2016-06-10 08:29:43 -07:00
  • 57c9d506b8 Fix namespacing for actionlog snipe 2016-06-10 07:57:54 -07:00
  • 5904de8718 Remove asset tag requirement from form request snipe 2016-06-10 05:54:20 -07:00
  • ac15fb9be9 Merge pull request #2147 from dmeltzer/Fix-Asset-Creation-with-old-data snipe 2016-06-10 05:51:33 -07:00
  • 2159d77fc2 No longer necessary. Daniel Meltzer 2016-06-10 07:46:38 -05:00
  • e9605891f3 Merge upstream and fix changes. Daniel Meltzer 2016-06-10 07:44:45 -05:00
  • 9c4c91063f Merge branch 'v3' into Fix-Asset-Creation-with-old-data Daniel Meltzer 2016-06-10 07:35:30 -05:00
  • 4e74c553bd Fix editing of assets. This also uses the asset form request for validation. Daniel Meltzer 2016-06-10 07:33:33 -05:00
  • 9e8b76d348 Use updated $request->input methods for 5.2 snipe 2016-06-10 05:16:27 -07:00
  • 6fa4d1252d Fixes purchase date if no purchase date given snipe 2016-06-10 05:00:49 -07:00
  • 7a9cfb1a8f Fixed label weirdness when no serial snipe 2016-06-10 04:43:17 -07:00
  • a0901247a3 Let superadmins through companyable trait snipe 2016-06-10 04:07:27 -07:00
  • 02a9394cd9 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-10 03:41:03 -07:00
  • ec4bc6c2af Allow superadmins to print labels snipe 2016-06-10 03:40:49 -07:00
  • 4e1472f66d Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-10 00:48:33 -07:00
  • c6ca1748cb Merge pull request #2146 from dmeltzer/Fix-Asset-Creation-with-old-data snipe 2016-06-10 00:47:30 -07:00
  • 25c10c43dd Disable select2 on ios. It's terribly slow, doesn't register click events, and has forces focus to the search bar by default (which makes the keyboard popup and take over the screen. The latter issue might justify disabling it for all mobile devices, but the performance issues certainly justify it on iOS. Daniel Meltzer 2016-06-09 20:31:23 -05:00
  • 044695cb02 Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point. Daniel Meltzer 2016-06-09 20:28:49 -05:00
  • f44d98924d Removed erroneous call to nonexistent model snipe 2016-06-09 14:42:13 -07:00
  • 66adffe6d9 Moved include snipe 2016-06-09 14:41:58 -07:00
  • c91c1f92cd Fixes #2132 snipe 2016-06-09 13:27:50 -07:00
  • bbb116f29c Fixes #2142 snipe 2016-06-09 12:25:51 -07:00
  • a04d6293d1 Proper hypenation of Snipe-IT in footer snipe 2016-06-09 03:08:42 -07:00
  • 845b182fdf Fixes format for users in category view snipe 2016-06-09 02:26:43 -07:00
  • 2b5fb04ba9 Allow admin to add user on checkout screen snipe 2016-06-09 00:36:52 -07:00
  • bb758d618b Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-06-08 23:28:53 -07:00
  • 9b2c7d749b Fixed barcode descriptions snipe 2016-06-08 23:28:44 -07:00
  • 51742d66df Removed uneeded size array snipe 2016-06-08 23:28:21 -07:00
  • 3a101aa0c8 Merge pull request #2131 from dmeltzer/fix-license-checkout snipe 2016-06-08 18:01:16 -07:00
  • 7f22d3f486 Fix margin for bottom to not be equal to side gutter, looks like a typo Drew Wilkinson 2016-06-07 13:03:21 -04:00
  • c9d6857c73 Swap bgutter and sgutter as they seem to be reversed. I assume s=side=horizontal and b=bottom=vertical... Drew Wilkinson 2016-06-07 12:39:53 -04:00
  • 9648c6f1d3 Fix license Checkout. Daniel Meltzer 2016-06-07 07:58:08 -05:00
  • 75eb2bbe09 Janky-ass form request stuff snipe 2016-06-06 21:02:06 -07:00
  • d4e231d5d4 Save permissions on new user snipe 2016-06-06 18:56:43 -07:00
  • 75dfb87671 Use form request for user add/edit to handle password and password confirmation snipe 2016-06-06 14:15:50 -07:00
  • 23936e465d Merge pull request #2123 from dmeltzer/fix-setup-on-windows snipe 2016-06-06 12:31:30 -07:00
  • 13d11bfdcc Merge pull request #2121 from dmeltzer/add-soft-pave snipe 2016-06-06 12:30:06 -07:00
  • 21506f4101 Merge pull request #2120 from dmeltzer/add-clone-to-models-index snipe 2016-06-06 12:29:54 -07:00
  • 51ab8ce41c Merge pull request #2119 from dmeltzer/fix-category-lists snipe 2016-06-06 12:29:31 -07:00
  • ea3e11e011 Fix missing posix_getpwuid on windows. Daniel Meltzer 2016-06-06 07:37:45 -05:00
  • 6ba37a3a8d Add a 'soft' delete option to the pave tool. This leaves db structure and migrations in place but removes everything inside the db except the first user. Daniel Meltzer 2016-06-05 10:24:42 -05:00
  • a89511674b Add clone icon to Assetmodels index page. Daniel Meltzer 2016-06-05 10:00:31 -05:00
  • cd9cca9c6b Modify Helper::categoryList() to take a category type parameter. Daniel Meltzer 2016-06-05 09:47:44 -05:00
  • 9f6eb02afc Don't purge users where show_in_list = 1 snipe 2016-06-03 12:13:59 -07:00
  • f8ac9a3f77 Fixes #2110 snipe 2016-06-03 11:48:20 -07:00
  • b28d966645 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-06-02 21:16:48 -07:00
  • 030b525535 Small readme changes snipe 2016-06-02 21:16:43 -07:00
  • 093bcdfe4f Fix to Dockerfile build; backup path must've changed. Brady Wetherington 2016-06-02 21:10:50 -07:00
  • 5e0cc241a0 Forgot to add the new docker.env file Brady Wetherington 2016-06-02 20:35:05 -07:00
  • 7d5c7991f4 Create backups directory snipe 2016-06-02 19:45:59 -07:00
  • 9ced24b127 Bumped version for RC-3 release snipe 2016-06-02 19:06:54 -07:00
  • fd32f6d4d5 New language strings snipe 2016-06-02 19:01:09 -07:00
  • c5d96812f3 Fixed erronerously removed save methods snipe 2016-06-02 17:22:23 -07:00
  • 6de6052185 Hardcoded page number to prevent error snipe 2016-06-02 17:17:50 -07:00
  • 402c955f1c Fixed title snipe 2016-06-02 17:17:42 -07:00
  • 2f8cbe4ac2 Better default mysqldump path snipe 2016-06-02 17:17:33 -07:00
  • 95f94c1cfb Fixed error when user has no permissions values snipe 2016-06-02 17:16:22 -07:00
  • 485fb26393 Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status snipe 2016-06-02 14:04:54 -07:00
  • 9551c07528 Fixes #2087 - bad route to maintenance edit snipe 2016-06-02 11:18:17 -07:00
  • 2d5a0deb31 Eager loading for requestable assets account page snipe 2016-06-02 02:57:22 -07:00
  • 7d2ea36997 Use permission gates on routes snipe 2016-06-02 02:50:00 -07:00
  • 97691726f0 Updates to permissions decoding snipe 2016-06-02 02:49:32 -07:00
  • dce549cc5c Updated debugbar prefs snipe 2016-06-02 02:49:17 -07:00
  • 049e13e365 Switch to gate for permission check snipe 2016-06-02 02:48:52 -07:00
  • dddb0f7267 Fixed group error message snipe 2016-06-02 02:46:49 -07:00
  • 5de6b8e016 Added gates to authservice provider for finer tuned permissions snipe 2016-06-02 02:40:49 -07:00
  • a3e9b3df86 Updated error page title snipe 2016-06-02 02:39:44 -07:00
  • 89e656e709 Switched to can/cannot for blade snipe 2016-06-02 02:39:36 -07:00
  • 5f5fddb7a4 Updated permissions array snipe 2016-06-02 02:39:23 -07:00
  • 46d3a784a2 Fixes groups for cloning users snipe 2016-06-02 00:41:10 -07:00
  • 4998b5ab1b Fixes #2080 snipe 2016-06-02 00:15:38 -07:00
  • 368bb77cf0 Merge pull request #2102 from dmeltzer/layout-fixes snipe 2016-06-01 21:25:40 -07:00
  • 37b416d5c7 Fix my git terrribleness. Daniel Meltzer 2016-06-01 23:00:29 -05:00
  • c7e695d3fe Revert "Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list" Daniel Meltzer 2016-06-01 22:55:37 -05:00
  • a152b0ae54 Center the logo text on small screens. It's looking more reasonable by the week... Daniel Meltzer 2016-06-01 22:52:25 -05:00
  • 9c77de6473 Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list Daniel Meltzer 2016-06-01 22:41:11 -05:00
  • 71ca17649c Improvements? Daniel Meltzer 2016-06-01 22:30:12 -05:00
  • 41f3d5ccbc Add new css file Daniel Meltzer 2016-06-01 21:42:48 -05:00
  • e32d5490d3 Add updated gulp css for testing. Probably revert before merge. Daniel Meltzer 2016-06-01 21:39:49 -05:00
  • d85d3b14f7 More layout fixes for small devices. Daniel Meltzer 2016-06-01 21:37:03 -05:00
  • 1daa6abf48 Merge pull request #2101 from dmeltzer/importer-again snipe 2016-06-01 18:13:02 -07:00
  • 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 Daniel Meltzer 2016-05-31 21:19:32 -05:00
  • 2ff1ee4d33 Fix some indentaiton and a missing tag, no functionality changes here. Daniel Meltzer 2016-05-31 20:35:48 -05:00
  • 04610e7864 Just use model validation for new user snipe 2016-06-01 18:04:11 -07:00
  • da01591ab8 Case insensitive string comparison for items when comparing with existing items. Fixes some false errors. Also remove stray characters from manufacturer logging. Daniel Meltzer 2016-06-01 19:31:24 -05:00
  • cffa76e627 Find first record, instead of hardcoded id 1 snipe 2016-06-01 15:50:50 -07:00
  • 9c4cd9c3ce Save email/username format in settings controller snipe 2016-06-01 15:45:26 -07:00
  • eacf70ee3f Updated validation snipe 2016-06-01 15:45:05 -07:00
  • 33a35ec7f5 Migration for for email/username format settings snipe 2016-06-01 15:44:37 -07:00
  • e0c07d8921 Language strings for email/username format snipe 2016-06-01 15:44:29 -07:00
  • 99f6207a69 Added macro for email/username format snipe 2016-06-01 15:44:16 -07:00
  • d786be4fc0 Use local fontawesome and added select2 snipe 2016-06-01 15:43:55 -07:00
  • 8a7a659a87 Added email domain, email format and username format to settings/setup form snipe 2016-06-01 15:43:39 -07:00
  • f3c6275f8d Removed settings form request snipe 2016-06-01 15:43:12 -07:00
  • 0a2fb2ace7 Merge pull request #2099 from dmeltzer/sqlite-fixes snipe 2016-06-01 11:49:51 -07:00
  • 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. Daniel Meltzer 2016-06-01 13:43:43 -05:00
  • 45d3d90c94 Merge pull request #2067 from dmeltzer/ajax-mobile-upload-PR snipe 2016-06-01 11:34:42 -07:00
  • a9870db83f Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-31 21:16:40 -07:00
  • 697ed0d53c Fixes UAT for User snipe 2016-05-31 21:16:30 -07:00
  • 3ddaa88694 Fix image processing when editing an existing asset. Also reenable the image scaling on the server, but boost limit to 800x800 Daniel Meltzer 2016-05-22 15:15:20 -05:00