Commit Graph

1881 Commits

Author SHA1 Message Date
snipe dae3220f2b Nicer formatting when 0 years 2014-06-09 02:52:19 -04:00
snipe 7448db6334 Notes on feature branches 2014-06-09 02:04:21 -04:00
snipe 2f90069792 Updated to request translation files 2014-06-09 01:59:03 -04:00
snipe ffab309940 More internationalization improvements per #151 2014-06-09 01:47:05 -04:00
snipe 34b4615f4e Additional internationalization for Hardware per #151 2014-06-09 01:12:08 -04:00
snipe 75590b6852 More internationalization strings for #151 2014-06-09 00:49:52 -04:00
snipe 610c405aa5 More fixes for #151 2014-06-09 00:25:45 -04:00
snipe 94016678f8 More internationalization per #151 2014-06-09 00:02:31 -04:00
snipe dc256583d4 Fixes #144 2014-06-06 13:40:54 -04:00
snipe cbc945299e Fixes #148 2014-06-05 13:39:14 -04:00
snipe 607484b294 Fixes #141 for mysql with strict mode enabled 2014-05-27 19:51:24 -04:00
snipe 9714178ce1 Fixes #141 2014-05-24 05:48:50 -04:00
snipe 46afc0cc73 Merge remote-tracking branch 'origin/develop' 2014-05-12 20:30:30 -04:00
snipe dfa5d1c642 Fixes #136 2014-05-12 18:06:49 -04:00
snipe e463b28b37 Deliberately vague message when user account doesn't exist 2014-05-06 16:16:19 -04:00
snipe 9db6605085 Smaller name requirement, to allow for folks like AJ Li, etc. 2014-05-06 16:08:05 -04:00
snipe d57955c7e7 Enforce password requirements on password reset 2014-05-06 16:07:00 -04:00
snipe ad9b1fc446 Fixes #139 2014-05-06 16:06:43 -04:00
snipe 3518ab9f55 Fixes #139 2014-05-06 16:06:22 -04:00
snipe cd8ebbd7b6 Merge remote-tracking branch 'origin/develop' 2014-05-06 05:29:03 -04:00
snipe c2ed0f6b21 More auth refinement v.0.3.2-alpha 2014-05-06 04:26:21 -04:00
snipe f4c5da57d0 Fixed auth error when user isn't logged in 2014-05-06 04:17:46 -04:00
snipe 8a7f71ec56 Better handling of non-admin roles 2014-05-06 04:14:14 -04:00
snipe b627c5cfbf More translation substitutions 2014-05-06 03:39:02 -04:00
snipe c21c3a4a9e Removed erroneous PDF option 2014-05-06 03:38:51 -04:00
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 594212db6b Merge remote-tracking branch 'origin/develop' 2014-05-06 00:50:05 -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 97af71d592 Merge remote-tracking branch 'origin/develop' 2014-05-05 22:19:31 -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 70fb2d98a0 Merge remote-tracking branch 'origin/develop'
Conflicts:
	.gitignore
2014-05-05 21:36:16 -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