Commit Graph

676 Commits

Author SHA1 Message Date
snipe d29e30bcf6 Translations 2014-05-06 03:38:05 -04:00
snipe 1cf42932fb Added currency symbol 2014-05-06 03:35:47 -04:00
snipe fee5fcf608 Titles for Group admin 2014-05-06 03:35:34 -04:00
snipe e512b8f7ef Removed hardcoded USD symbol 2014-05-06 03:35:03 -04:00
snipe 5e1fedda45 Added Travis-CI badge 2014-05-06 01:28:21 -04:00
snipe d0789da472 Copy the mail config file to prod for CI build as well. Duh. 2014-05-06 01:22:01 -04:00
snipe fc21fc1aab Put prod database file in app/config 2014-05-06 01:13:24 -04:00
snipe 24ae1b948f Updated username so the DB can be created
(travis CI doesn't allow custom DB usernames)
2014-05-06 01:07:16 -04:00
snipe f1cc547151 Copy DB config file for travis 2014-05-06 01:02:49 -04:00
snipe ca0f5df63a Reverting Pull Request #138 v.0.3.1-alpha 2014-05-06 00:48:09 -04:00
snipe 57e903a926 Added Diff language string 2014-05-06 00:10:29 -04:00
snipe 06067fc19c Fixed CSV rexport 2014-05-06 00:10:19 -04:00
snipe 67aba76d3f Fixing this change from #109 that somehow got reverted 2014-05-05 23:41:41 -04:00
snipe 96e47612fa Longer default password requirement 2014-05-05 23:40:05 -04:00
snipe 71c0c01430 Updated environmental config for hostname-only 2014-05-05 22:02:32 -04:00
snipe 78f4615d01 Travis CI 2014-05-05 21:59:23 -04:00
snipe d93639d480 Updated README for 4.1 2014-05-05 21:38:18 -04:00
snipe 34960e26cc Merge pull request #138 from refinery29/qr-codes-ftw
Add site setting to define text below asset QR codes
2014-05-05 21:31:45 -04:00
snipe 3473ef5fa6 Updated to Laravel 4.1 2014-05-05 21:28:58 -04:00
snipe 2fc197623a Update to Laravel 4.1 2014-05-05 21:21:56 -04:00
snipe 7bc681dfef Bumped to laravel 4.1 2014-05-05 20:38:02 -04:00
Jake McGraw af603f0380 make text below asset tags configurable 2014-05-03 20:06:59 +00:00
snipe 1d10425d19 Merge pull request #135 from Zyg0te/develop
Adjusted zip and state field length requirements
2014-04-29 17:21:03 -04:00
Zyg0te 5690e9ce1f Fixed code indentation for Apache virtualhost example
The code indentation was incorrect, borking the syntax highlighting in
the README.
2014-04-24 11:25:55 +02:00
Zyg0te 792e45bd12 Adjusted zip and state field length requirements
State abbreviations, if used at all, are not neccessarily 2 characters
outside the US and zip codes aren't always 5 digits either. It's
probably a good idea not to enforce US centric length requirements to
these fields in the Location model.
2014-04-24 11:20:20 +02:00
snipe ad8b95f07c Merge pull request #130 from FleischKarussel/patch-1
vhost.conf for linux mod_rewrite enabled
2014-04-04 14:07:50 -04:00
FleischKarussel 729f94331f vhost.conf for linux mod_rewrite enabled 2014-04-04 13:17:31 +02:00
snipe faa9b95a6f Merge pull request #128 from FleischKarussel/patch-1
https for getcomposer and github downloads
2014-04-03 15:11:03 -04:00
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