ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,600 Commits 84 Branches 293 Tags
00b93883e4bae62ae00a30d65c4bdffecedcc2c5
Commit Graph

155 Commits

Author SHA1 Message Date
snipe 999b237ed7 Added asset import to nav 2015-09-22 20:22:36 -07:00
snipe d79e2a0864 Allow > tags for custom CSS to modify bootstrap 2015-09-14 16:47:16 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
snipe 9f4fca4238 Fixes #522 2015-08-12 21:25:36 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
snipe 88e10516a9 Updated footer links 2015-08-11 14:19:13 -07:00
snipe 183f8ae1bf Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/commands/ImportCommand.php
#	app/lang/en/admin/users/message.php
#	app/lang/en/general.php
 2015-08-04 12:51:35 -07:00
Vincent Sposato 03818adc14 Added the new report to the sidebar of reports 2015-08-01 12:23:41 -04:00
madd15 5297d699b3 Fix logo url 2015-07-30 18:32:43 +09:30
snipe 1e38ced885 Nicer display of "add new" inline functionality. 
TODO:

Handle validation failures in a less fugly way
 2015-07-28 11:58:45 -07:00
snipe eaf077f807 Fixes #946 - navbar custom color not working in FF 2015-07-24 16:29:54 -07:00
Vincent Sposato e47146faee Moved link for asset maintenances to the asset menu with the other items related to assets / hardware 2015-07-20 21:35:37 -04:00
Vincent Sposato d1d6fe26a6 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-20 21:34:19 -04:00
Vincent Sposato 3df0550b19 Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-07-20 21:26:23 -04:00
Vincent Sposato 8ddf035a9b Updated the left sidebar of the layout to include the new Improvements area 2015-07-20 21:03:36 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 41b711740a Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking 
# Conflicts:
#	app/controllers/admin/ReportsController.php
#	app/lang/en/general.php
#	app/routes.php
#	app/views/backend/hardware/view.blade.php
#	app/views/backend/layouts/default.blade.php
#	composer.lock
 2015-07-20 16:12:35 -07:00
Vincent Sposato a7abea692d Moved link for asset maintenances to the asset menu with the other items related to assets / hardware 2015-07-10 10:25:32 -04:00
snipe c2d63915c3 Fixed insecure font call 2015-07-08 17:48:59 -07:00
madd15 e714def74a Fix Reports showing class="active" 2015-07-08 11:46:11 +09:30
madd15 665ffa6571 Update Hardware Submenu 
Correctly identify the status from the url
 2015-07-08 11:37:20 +09:30
Vincent Sposato 1b423f5b54 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-06 10:36:54 -04:00
Vincent Sposato 269f73205a Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-06-28 15:00:55 -04:00
Vincent Sposato 1befbfee6f Updated the left sidebar of the layout to include the new Improvements area 2015-06-27 13:51:39 -04:00
snipe 84e130d6aa Fixes #869 - compatibility mode for IE 2015-06-25 16:22:07 -07:00
snipe 537630bae4 Removed unneeded stylesheet 2015-06-23 11:33:31 -07:00
snipe ef75880398 Added backups to topnav 2015-06-19 17:58:53 -07:00
snipe 19604480bb Consumables section 
TODO:

- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
 2015-06-09 19:50:34 -07:00
snipe 8334e7b863 Removed extra open sans call 2015-05-19 19:37:34 -07:00
Daniel Nemanic 20d8ad29e5 Updating Dashboard Link URL 
Updating link to real application URL.
 2015-05-07 09:38:16 +02:00
snipe 75644eb894 Dashboard points to app url 2015-05-07 00:30:20 -07:00
snipe 3881e2e83e Fixes #784 - add "create accessory" to topnav 2015-05-04 11:24:25 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
madd15 c6419e1c07 Update link to Documentation in footer 2015-04-17 16:01:44 +09:30
madd15 2e0fa9126a Add dashboard to side navigation 2015-04-14 10:02:37 +09:30
snipe c92f09fddb Merge pull request #700 from madd15/feat/savestate 
Fix saveState, change chumper defaults
 2015-03-27 13:33:33 -07:00
Madd15 87bf51b033 Restore JS changes 2015-03-27 16:52:40 +10:30
Madd15 06b3d6e5ce Fix saveState, change chumper defaults 
Hopefully this will fix the saveState issues
 2015-03-27 16:49:03 +10:30
madd15 b32379393f Fix missed hardware statuses 2015-03-27 07:50:13 +10:30
madd15 1620186f5d Change Deleted to new ?status 2015-03-18 10:11:11 +10:30
snipe e23c0cb89f Removed responsive for ColVis debugging 2015-03-13 17:28:30 -07:00
snipe 96e40721b2 Added type to query 2015-03-13 16:50:12 -07:00
Madd15 3656822ac9 Add tableTools 2015-03-13 17:25:53 +10:30
madd15 47136ca774 Add dataTables colVis 2015-03-13 16:01:41 +10:30
snipe 817384b761 Fixes #597 - print-friendly view on users 2015-03-04 17:06:07 -08:00
snipe 3f9d9f23d5 Fixes #280 - updated link to use config url 2015-03-04 16:10:51 -08:00
snipe 2540e90c37 Fixes #605 - hides user requestable view from admins 2015-03-04 14:01:47 -08:00
snipe d7b7a3a4a8 Better version output 2015-02-28 15:18:31 -08:00
snipe b986b3276c Dynamic version number on settings and footer 2015-02-28 14:59:03 -08:00
snipe 9b42d3a4fc Bumped version number 2015-02-28 12:27:22 -08:00