Commit Graph

  • 01b574069a Fixes #1362 - status labels losing type on edit snipe 2015-11-20 09:20:14 -08:00
  • cc930fc5b8 Fixed links to getting help and common issues snipe 2015-11-20 09:19:45 -08:00
  • 67a58221eb Fixes #1368 - typos in installer snipe 2015-11-20 07:30:40 -08:00
  • 31c4a63ec0 Added copy for apache SSL file and commands to enable SSL in apache Bjarne K 2015-11-20 11:55:57 +01:00
  • a0f2ad5d54 point to dev Walter 2015-11-19 21:32:58 -05:00
  • 2c7553e81e Setting up logging for the install script Walter 2015-11-19 21:15:47 -05:00
  • e82ede5d44 Fix: some Company functions throw when seeding the DB Abdullah Alansari 2015-11-19 09:44:06 +03:00
  • e91a22fce0 Fix assumeng Setting::getSettings() is not null in Company Abdullah Alansari 2015-11-19 09:32:36 +03:00
  • 31ecd165a3 Merge remote-tracking branch 'upstream/develop' into multiple-companies Abdullah Alansari 2015-11-19 09:24:57 +03:00
  • fe44846c1b Fix: only super users can change multiple companies support option Abdullah Alansari 2015-11-19 09:17:50 +03:00
  • c708a24657 Restrict backups to super users Abdullah Alansari 2015-11-19 09:13:20 +03:00
  • dbdc2c8e64 Fix some typos (e.g: companayable) Abdullah Alansari 2015-11-19 08:48:43 +03:00
  • e66e2e42d3 Use global scope for companyable children Abdullah Alansari 2015-11-19 08:42:17 +03:00
  • a598fdcb59 Add global scope for companyable children Abdullah Alansari 2015-11-19 08:03:19 +03:00
  • 177fadba8a Add better scoping for companayable children Abdullah Alansari 2015-11-19 07:41:32 +03:00
  • 1fe5bd3770 Merge remote-tracking branch 'origin/develop' v2.0.5 snipe 2015-11-18 14:29:53 -08:00
  • 2b26fd7e20 Fixed string in gh-changelog snipe 2015-11-18 14:29:29 -08:00
  • 7a0598dfc3 Pulled naughty language from changelog snipe 2015-11-18 13:56:13 -08:00
  • 5ebb267a53 Updated changelog script snipe 2015-11-18 13:52:57 -08:00
  • 638a7773bd syntax error Wahlstedt, Walter 2015-11-18 16:36:02 -05:00
  • 113dfc9c24 working on ldap import button Wahlstedt, Walter 2015-11-18 16:22:04 -05:00
  • 3942fd1869 begin work on idap import button Walter 2015-11-18 12:11:42 -05:00
  • d2423b2fc8 Show company name for the remaining entities Abdullah Alansari 2015-11-18 18:41:25 +03:00
  • a8e686cdf7 added SSL config for apache bmk 2015-11-18 15:58:17 +01:00
  • 08781a561b Fix: use global scope for companies support Abdullah Alansari 2015-11-18 16:49:34 +03:00
  • 8fb7d82bab Fix no admin/consumables route Abdullah Alansari 2015-11-18 16:46:29 +03:00
  • ced2a99031 Add Eloquent global scope for companayables Abdullah Alansari 2015-11-18 09:29:35 +03:00
  • 0a97c626e7 Fix $inout used when undefined Abdullah Alansari 2015-11-18 07:16:53 +03:00
  • 6478425be6 Fix dashboard shows all companies Abdullah Alansari 2015-11-18 06:14:08 +03:00
  • 999910f31f Fix 'use' used with non-compound Abdullah Alansari 2015-11-18 05:35:27 +03:00
  • 73a183677d Revert "add escaping to ldap fields in blades" Wahlstedt, Walter 2015-11-17 16:12:24 -05:00
  • 1d24450dcd add escaping to ldap fields in blades Wahlstedt, Walter 2015-11-17 16:06:55 -05:00
  • 6f338e573c set required_if ldap_enabled box has been checked. Wahlstedt, Walter 2015-11-17 16:00:52 -05:00
  • 8e44421788 added Crypt class and set ldap_pword field to longText Wahlstedt, Walter 2015-11-17 15:20:55 -05:00
  • e031239cf0 Removed escaping, add sometimes required, add encrypt ldap password Wahlstedt, Walter 2015-11-17 13:49:59 -05:00
  • 21a280676b Merge pull request #1356 from merid14/develop snipe 2015-11-17 09:34:38 -08:00
  • ac44140d83 fix edit blades Wahlstedt, Walter 2015-11-17 10:50:39 -05:00
  • c8ecddba54 Revert "Set required fields if ldap is enabled" Wahlstedt, Walter 2015-11-17 10:47:59 -05:00
  • 2f69be03d3 Set required fields if ldap is enabled Wahlstedt, Walter 2015-11-17 10:46:29 -05:00
  • 7e8a0af6e5 Set default to not seed DB Wahlstedt, Walter 2015-11-17 10:12:26 -05:00
  • 63cd0c1ae1 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings Wahlstedt, Walter 2015-11-17 10:11:38 -05:00
  • 8a014d4bd3 update ldap integration Wahlstedt, Walter 2015-11-17 10:00:06 -05:00
  • 8793a04869 add ldap integration to settings page. Wahlstedt, Walter 2015-11-17 09:59:20 -05:00
  • d72df21b3b Update migration and blades Wahlstedt, Walter 2015-11-16 16:31:43 -05:00
  • 08d0fe5118 change tables from text to string/int Wahlstedt, Walter 2015-11-16 13:21:00 -05:00
  • 2ec5f340e8 update validators and lang Wahlstedt, Walter 2015-11-16 13:08:51 -05:00
  • 3e1e9b0077 syntax errors Wahlstedt, Walter 2015-11-16 12:48:41 -05:00
  • 937249b960 enable ldap import if data exists in database Wahlstedt, Walter 2015-11-16 12:38:47 -05:00
  • 50ea6c66f9 LDAP Settings update Wahlstedt, Walter 2015-11-16 11:30:51 -05:00
  • 0910d9cf8c correct name of migration Wahlstedt, Walter 2015-11-16 09:44:06 -05:00
  • 30e8555148 updating users controller to work with database fields Walter 2015-11-15 22:48:56 -05:00
  • 8f6c37c301 add ldap to en lang Walter 2015-11-15 22:22:42 -05:00
  • b202e01205 Add full multiple companies support Abdullah Alansari 2015-11-16 06:03:27 +03:00
  • 7f9fab0055 adjusted settings Walter 2015-11-15 21:42:49 -05:00
  • b210d90148 Merge remote-tracking branch 'origin/develop' snipe 2015-11-13 12:07:34 -08:00
  • 23d10a8f7f Make company field optional Abdullah Alansari 2015-11-13 09:19:18 +03:00
  • 6d365157e7 Changed to using Entrypoint instead of CMD for better start/stop Brady Wetherington 2015-11-12 21:50:58 -08:00
  • 3a99136f73 More documentation fixes Brady Wetherington 2015-11-12 21:14:10 -08:00
  • 50170dd774 Improve start script, add entrypoint script Brady Wetherington 2015-11-12 20:05:39 -08:00
  • 5e1bec71f2 Start to move README over to emphasize running docker pull snipe/snipe-it Brady Wetherington 2015-11-12 14:07:05 -08:00
  • d73134f32d Merge branch 'develop' into docker_enhancements Brady Wetherington 2015-11-12 13:44:40 -08:00
  • d8df61bd32 Merge remote-tracking branch 'upstream/develop' into multiple-companies Abdullah Alansari 2015-11-12 09:30:11 +03:00
  • 12912b3e27 adjusting the migration Walter 2015-11-11 23:43:02 -05:00
  • d9cd4a4da0 setting up views for ldap Walter 2015-11-11 23:03:46 -05:00
  • 2afc252549 Link to category listing from accessories snipe 2015-11-11 17:43:24 -08:00
  • aa05d041bd Fixes #1324 - missing $inout variable when if/else not met snipe 2015-11-11 17:22:28 -08:00
  • bbe0189be2 CSS for max image size on asset view snipe 2015-11-11 16:06:17 -08:00
  • a0599712a6 Show model image if available and no asset image snipe 2015-11-11 16:06:07 -08:00
  • 1a4926ce13 Sort by asset image for PR #1330 snipe 2015-11-11 15:57:41 -08:00
  • 3c8959e92d Bumped version snipe 2015-11-11 15:56:10 -08:00
  • ab3871f678 Small changes for PR #1330 snipe 2015-11-11 15:56:01 -08:00
  • 7297a6031e Merge pull request #1330 from mtucker6784/develop snipe 2015-11-11 15:51:31 -08:00
  • 75bd29b027 Added cookie expiration for sorting/filtering snipe 2015-11-11 14:50:17 -08:00
  • b77b9c0434 Merge pull request #1323 from merid14/develop snipe 2015-11-10 18:02:47 -08:00
  • b9c36f8638 Fixes #1335 - editing maintenance snipe 2015-11-10 18:02:06 -08:00
  • ecae451ebf form validation Walter 2015-11-09 22:34:18 -05:00
  • 9627f15412 update settings controller to add ldap field validation Walter 2015-11-09 22:32:00 -05:00
  • 464f11c398 setting up bones for ldap settings Walter 2015-11-09 22:09:09 -05:00
  • 90009db1b5 Image is now recorded upon initial asset creation. mtucker6784 2015-11-09 12:01:31 -07:00
  • d7f8d0fc04 Changed image save location in AssetsController mtucker6784 2015-11-09 09:35:10 -07:00
  • effad46cc0 create assets image directory mtucker6784 2015-11-09 09:16:53 -07:00
  • 4509631921 Add image column migration mtucker6784 2015-11-09 08:47:05 -07:00
  • d1a306cfd8 Yay, asset image progress! mtucker6784 2015-11-09 08:25:29 -07:00
  • 2de4741170 Add password confirmation, hide password and set default database seed to no Walter 2015-11-07 22:21:07 -05:00
  • fc609ece12 Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop Walter 2015-11-07 22:13:48 -05:00
  • ecfd1b2693 Merge remote-tracking branch 'origin/develop' snipe 2015-11-07 15:54:37 -08:00
  • a8da68d3fd Fixes #1320 - added name for cookie table snipe 2015-11-07 15:53:39 -08:00
  • 69970d1296 Merge remote-tracking branch 'origin/develop' snipe 2015-11-07 15:44:27 -08:00
  • ef7c7da4e5 Merge pull request #1302 from merid14/develop snipe 2015-11-07 15:42:06 -08:00
  • 306d8ebaf7 Fixes #1317 - regression issue in bulk delete snipe 2015-11-07 15:40:25 -08:00
  • 250880c6f3 Include default text in status label helper snipe 2015-11-07 15:39:03 -08:00
  • 6bf2a2875f Add initial support for multiple companies Abdullah Alansari 2015-11-07 14:40:48 +03:00
  • 9f43b6af9f fixed apache config file Walter 2015-11-06 15:17:54 -05:00
  • a47a4e83e2 fixed issues with sed command and / Walter 2015-11-06 11:53:07 -05:00
  • ca1384504a fixed tzone variable assignment Walter 2015-11-06 10:03:58 -05:00
  • fc6bb7f056 sets the timezone automatically Walter 2015-11-06 09:02:51 -05:00
  • 62cee46a83 update webdir for debian and fix the error logs Walter 2015-11-06 08:30:51 -05:00
  • c94ece2925 changed replace for sed command Walter 2015-11-05 21:42:20 -05:00
  • 5d5882ea5b moved the permissions changes to the end Walter 2015-11-05 21:40:51 -05:00
  • 61fc912c47 moving permisions block and some mysql stuff Walter 2015-11-05 16:25:03 -05:00