Commit Graph

648 Commits

Author SHA1 Message Date
FleischKarussel 0e633efca2 https for getcomposer and github downloads 2014-04-03 17:10:41 +02:00
snipe b2015e7e08 Merge pull request #127 from domtancredi/develop
Fix for broken datatables in upgrading to v2.2
2014-03-18 17:07:12 -04:00
Dom Tancredi efad5db082 Fix for broken datatables in upgrading to v2.2 2014-03-16 15:00:30 -04:00
snipe 9423c9e9d3 Merge pull request #124 from DGAzr/develop
Adding escape to the dash so that it is a literal rather than a range
2014-02-11 14:31:49 -05:00
Dustan Ashley 366e7d01a3 Adding escape to the dash so that it is a literal rather than a range 2014-02-11 07:24:27 -05:00
snipe a2f068eb8f Missed one v0.3.0-alpha 2014-01-28 20:28:31 -05:00
snipe 580590b4c0 Fixed === to == (PHP is loosely typed) 2014-01-28 20:24:37 -05:00
snipe 5ec87e81b1 Handle logs/views dir better 2014-01-28 18:05:15 -05:00
snipe 60d94eea04 Changes serial to text area, allow new lines. Fixes #118 2014-01-28 17:42:20 -05:00
snipe 78e3171fa6 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2014-01-28 17:41:35 -05:00
snipe d03d692868 Merge pull request #121 from buzzedword/feature/default-directories-in-storage
Added default folder structure for laravel.
2014-01-28 14:37:46 -08:00
Daniel Garcia 4b4eefb4cc Added default folder structure for laravel. 2014-01-28 17:35:57 -05:00
snipe 8b3f409703 Added logs and views dir 2014-01-28 16:56:33 -05:00
snipe d497a84245 Merge pull request #119 from refinery29/qr-codes-ftw
Added support for QR codes in Asset view
2014-01-28 11:52:22 -08:00
Jake McGraw 01612652b5 use same dimensions in render and display 2014-01-28 05:33:03 +00:00
Jake McGraw 5cb0a1465e added QR code route for asset controller
added QR code inclusion on asset controller getView  action/template
2014-01-28 05:16:57 +00:00
Jake McGraw 55b54e0a42 added sql migration for qr_code in settings table
added baconqr to composer package list
added admin settings page for qr code
2014-01-28 04:25:58 +00:00
snipe a3eb61b307 Cleaned up gitignore 2014-01-14 18:41:07 -05:00
snipe 9e5e9ee96b Minor formatting change 2014-01-14 18:34:36 -05:00
snipe 92347c6707 Full path to avoid any confusion 2014-01-14 18:26:52 -05:00
snipe dc5ea81d34 Backticks are hard. 2014-01-14 18:23:56 -05:00
snipe 9c369d72e1 Fixed typo 2014-01-14 18:20:41 -05:00
snipe ea0560e1ce Updated readme for #116 2014-01-14 18:19:22 -05:00
snipe cd62be0de0 Minor div fix 2014-01-04 18:35:06 -05:00
snipe 7a3f6fb714 Merge branch 'refs/heads/feeva-localization' into develop 2014-01-04 18:25:57 -05:00
snipe 1ed761c97f Merge branch 'localization' of github.com:feeva/snipe-it into feeva-localization
Conflicts:
	app/views/backend/layouts/default.blade.php
2014-01-04 18:25:25 -05:00
snipe a193e3118d Merge pull request #113 from feeva/issue58-modal-failure
Issue #58 - Modal stops passing title/message/href through if modal is canceled
2014-01-04 15:09:44 -08:00
feeva e9a675a9a4 Merge branch 'issue58-modal-failure' of https://github.com/feeva/snipe-it into issue58-modal-failure 2014-01-04 18:24:42 +00:00
feeva 439a139d7c Issue #58 - Modal stops passing title/message/href through if modal is
canceled
2014-01-04 18:23:52 +00:00
feeva 40d6ad09ae Hard-coded English text strings should be moved to their language files 2014-01-04 17:55:19 +00:00
mars 3acd88d451 Issue #58 - Modal stops passing title/message/href through if modal is
canceled
2013-12-26 02:51:01 +09:00
snipe 8806208e83 More gracefully handle TokenMismatchException errors 2013-12-13 14:34:09 -05:00
snipe 5ba487d74e Removed CSRF filters - they already run elsewhere 2013-12-13 14:33:42 -05:00
snipe f6717d9f49 Added manager drop down for users, manager name in index 2013-12-12 01:49:38 -05:00
snipe 3ec6df492d Added manager_id to DB, install script 2013-12-12 01:12:42 -05:00
snipe cdddbcf695 Using URL::previous to determine back button address 2013-12-12 00:50:56 -05:00
snipe 483f9b1289 Slight layout tweak for smaller buttons 2013-12-10 17:13:33 -05:00
snipe b2912195ac Added EOL to report view 2013-12-10 14:56:16 -05:00
snipe 1cec46f997 Updated comment, made save on edit return to listing page 2013-12-10 05:17:15 -05:00
snipe 4468cbd096 Fixes #112 2013-12-10 04:48:40 -05:00
snipe 4c3e2a9a68 DB seeding for #112 2013-12-10 03:52:23 -05:00
snipe da9f28fbe7 DB migration for #112 2013-12-10 03:48:20 -05:00
snipe 8ac394bd3f Escaping parens 2013-12-06 12:36:43 -05:00
snipe d36409d037 Layout improvements 2013-12-06 05:18:04 -05:00
snipe 7e9be9b935 Truncate serial on index view at 40, UX improvements 2013-12-06 05:07:26 -05:00
snipe dd701d253c Set values to null if they are 0 2013-12-06 04:59:24 -05:00
snipe 78b3a0e1f9 Make license fields nullable migration 2013-12-06 04:58:53 -05:00
snipe 1e9a81f59d Cleanup for licenses view page 2013-12-06 04:58:37 -05:00
snipe 432f44118f Fixed FK in licenses model 2013-12-06 04:58:21 -05:00
snipe b697c77cd8 Fixing error when no depreciation 2013-12-06 02:50:14 -05:00