Commit Graph

2874 Commits

Author SHA1 Message Date
Walter ecae451ebf form validation 2015-11-09 22:34:18 -05:00
Walter 9627f15412 update settings controller to add ldap field validation 2015-11-09 22:32:00 -05:00
Walter 464f11c398 setting up bones for ldap settings
add migration
add ldap settings to settings controller
add ldap fields edit settings views
2015-11-09 22:09:09 -05:00
Walter 2de4741170 Add password confirmation, hide password and set default database seed to no 2015-11-07 22:21:07 -05:00
Walter fc609ece12 Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop 2015-11-07 22:13:48 -05:00
snipe a8da68d3fd Fixes #1320 - added name for cookie table 2015-11-07 15:53:39 -08:00
snipe ef7c7da4e5 Merge pull request #1302 from merid14/develop
Reworked the Installer
2015-11-07 15:42:06 -08:00
snipe 306d8ebaf7 Fixes #1317 - regression issue in bulk delete 2015-11-07 15:40:25 -08:00
snipe 250880c6f3 Include default text in status label helper 2015-11-07 15:39:03 -08:00
Walter 9f43b6af9f fixed apache config file 2015-11-06 15:17:54 -05:00
Walter a47a4e83e2 fixed issues with sed command and / 2015-11-06 11:53:07 -05:00
Walter ca1384504a fixed tzone variable assignment 2015-11-06 10:03:58 -05:00
Walter fc6bb7f056 sets the timezone automatically 2015-11-06 09:02:51 -05:00
Walter 62cee46a83 update webdir for debian and fix the error logs 2015-11-06 08:30:51 -05:00
Walter c94ece2925 changed replace for sed command 2015-11-05 21:42:20 -05:00
Walter 5d5882ea5b moved the permissions changes to the end 2015-11-05 21:40:51 -05:00
Walter 61fc912c47 moving permisions block and some mysql stuff 2015-11-05 16:25:03 -05:00
Walter e54bbcd37f working on debian installer 2015-11-04 21:14:19 -05:00
snipe c1961c0e40 Merge pull request #1313 from mtucker6784/develop
Make Model column a hyperlink to access the model page.
2015-11-04 15:26:25 -08:00
Michael T 11c2fcd094 Remove new window target 2015-11-04 16:10:27 -07:00
Michael T b856e7f2c6 Make Model column a hyperlink to access the model page. 2015-11-04 15:55:41 -07:00
Walter 56b50468d2 fixed packages for centos6 2015-11-04 16:01:25 -05:00
Walter c7057f550f removed a var 2015-11-04 10:08:04 -05:00
Walter 037cda36b2 formatting 2015-11-04 09:17:16 -05:00
Walter f3de39efd6 syncing centos 6 and centos 7
wasnt replacing production.yourserver.com with the fdqn. took out
http://
changed .conf file name to $name.conf instead of $fdqn.conf
2015-11-04 09:06:48 -05:00
snipe af5c221385 Updated language strings v2.0.5-pre 2015-11-04 03:42:37 -08:00
snipe feb74806a8 Removed models override 2015-11-04 01:08:17 -08:00
snipe 14ba5a3b77 Fixes #1310 - adds version hash to table name to prevent cookie issues for folks who pull from dev 2015-11-04 01:08:05 -08:00
snipe bc8c8e4225 Fixes #1012 - more consistency in manufacturer view 2015-11-04 00:48:53 -08:00
snipe dc64ad55ee Fixed link to manufacturers view 2015-11-04 00:37:43 -08:00
snipe 7e2b4183f6 Added in/out to categories 2015-11-04 00:37:27 -08:00
snipe 0a843fa856 OMFG really? 2015-11-04 00:18:22 -08:00
snipe 5a687f280f One more currency tweak 2015-11-04 00:15:35 -08:00
snipe 4b2e7b9b06 Fixes #1013 - show location name on asset view page 2015-11-04 00:13:48 -08:00
snipe 1ac41a72ec Link to asset in asset maintenance screen 2015-11-04 00:07:00 -08:00
snipe 6e117efebd Fixed dumb indenting 2015-11-03 23:58:12 -08:00
snipe 17207ddea1 Fixed table cookie name 2015-11-03 23:57:58 -08:00
snipe 130b1b4f4a Converted category asset listing to bootstrap tables for #1266 2015-11-03 23:57:31 -08:00
snipe 8a7981a4ae Updated currency array 2015-11-03 22:49:34 -08:00
snipe 90513b06f5 Removed duplicate UK/GB 2015-11-03 22:23:33 -08:00
snipe 750fc84592 Updated seeder with currency 2015-11-03 22:22:10 -08:00
snipe 2a43491792 Fixes #1291 on the asset view as well 2015-11-03 22:19:58 -08:00
snipe f4331f4498 Fixes #1291 - use location currency and fall back to defaul currency for asset maintenances 2015-11-03 22:04:57 -08:00
Walter 0d1544c3d6 Fixing some package issues and syntax errors 2015-11-03 16:29:18 -05:00
Walter 958672dfd3 Fixed missing vars and typos 2015-11-03 14:12:21 -05:00
Walter 7355fd9ebe Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	install.sh
2015-11-03 13:39:12 -05:00
Walter 5df26f9b0a Fixed the ubuntu install portion that i broke 2015-11-03 13:33:03 -05:00
snipe a587b72c71 Fixed dumb indenting 2015-11-02 20:11:26 -08:00
snipe 0b0b55619b Fixes #1291 - Use current currency, or sane fallback 2015-11-02 20:06:06 -08:00
snipe a760a7575a Added user notes back in 2015-11-02 19:28:51 -08:00