08d05b481f
Fixes #158
2014-06-19 16:10:00 -04:00
7742bb30c1
Merge remote-tracking branch 'origin/develop'
2014-06-18 16:04:46 -04:00
bf3062f4ef
Merge pull request #160 from exula/issue-125-license-seat
...
Improve License Editing to add or delete seats
2014-06-18 15:48:52 -04:00
8f744e02fd
Improve License Editing to add or delete seats
2014-06-18 13:39:54 -04:00
ba3e56df9a
Merge remote-tracking branch 'origin/develop'
2014-06-17 14:07:32 -04:00
8aebaaf502
Few more localization strings for #151
2014-06-10 04:15:50 -04:00
c937796224
More language strings, per #151
2014-06-09 21:30:58 -04:00
74653d3480
More refactoring of language structure, language strings per #151
2014-06-09 19:56:47 -04:00
65d298a557
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
Conflicts:
.travis.yml
2014-06-09 18:34:58 -04:00
04f23ef792
Encrypted slack API token after regen
2014-06-09 18:27:16 -04:00
507b6e5128
Merge pull request #154 from buzzedword/patch-2
...
Update .travis.yml
2014-06-09 18:22:21 -04:00
4271f5265d
Update .travis.yml
...
Added composer validation to fail fast on travis build instead of going directly to install.
2014-06-09 18:19:22 -04:00
d9a8ede623
Merge pull request #153 from buzzedword/patch-1
...
Update composer.json
2014-06-09 18:06:03 -04:00
117ed3294b
Update composer.json
...
Modified composer.json away from laravel defaults to be more on brand.
- Specified support locations
- Issues
- Source
- Added license shorthand as defined by http://spdx.org
- Added homepage
- Added keywords
- Added name
- Added description
2014-06-09 18:03:08 -04:00
cd0f42c508
Alphabetized language files, more for #151 , refactoring language string hierarchy.
2014-06-09 17:45:52 -04:00
2fe66c1bdc
More internationalization per #151
2014-06-09 16:01:44 -04:00
dae3220f2b
Nicer formatting when 0 years
2014-06-09 02:52:19 -04:00
7448db6334
Notes on feature branches
2014-06-09 02:04:21 -04:00
2f90069792
Updated to request translation files
2014-06-09 01:59:03 -04:00
ffab309940
More internationalization improvements per #151
2014-06-09 01:47:05 -04:00
34b4615f4e
Additional internationalization for Hardware per #151
2014-06-09 01:12:08 -04:00
75590b6852
More internationalization strings for #151
2014-06-09 00:49:52 -04:00
610c405aa5
More fixes for #151
2014-06-09 00:25:45 -04:00
94016678f8
More internationalization per #151
2014-06-09 00:02:31 -04:00
dc256583d4
Fixes #144
2014-06-06 13:40:54 -04:00
cbc945299e
Fixes #148
2014-06-05 13:39:14 -04:00
607484b294
Fixes #141 for mysql with strict mode enabled
2014-05-27 19:51:24 -04:00
9714178ce1
Fixes #141
2014-05-24 05:48:50 -04:00
46afc0cc73
Merge remote-tracking branch 'origin/develop'
2014-05-12 20:30:30 -04:00
dfa5d1c642
Fixes #136
2014-05-12 18:06:49 -04:00
e463b28b37
Deliberately vague message when user account doesn't exist
2014-05-06 16:16:19 -04:00
9db6605085
Smaller name requirement, to allow for folks like AJ Li, etc.
2014-05-06 16:08:05 -04:00
d57955c7e7
Enforce password requirements on password reset
2014-05-06 16:07:00 -04:00
ad9b1fc446
Fixes #139
2014-05-06 16:06:43 -04:00
3518ab9f55
Fixes #139
2014-05-06 16:06:22 -04:00
cd8ebbd7b6
Merge remote-tracking branch 'origin/develop'
2014-05-06 05:29:03 -04:00
c2ed0f6b21
More auth refinement
2014-05-06 04:26:21 -04:00
f4c5da57d0
Fixed auth error when user isn't logged in
2014-05-06 04:17:46 -04:00
8a7f71ec56
Better handling of non-admin roles
2014-05-06 04:14:14 -04:00
b627c5cfbf
More translation substitutions
2014-05-06 03:39:02 -04:00
c21c3a4a9e
Removed erroneous PDF option
2014-05-06 03:38:51 -04:00
d29e30bcf6
Translations
2014-05-06 03:38:05 -04:00
1cf42932fb
Added currency symbol
2014-05-06 03:35:47 -04:00
fee5fcf608
Titles for Group admin
2014-05-06 03:35:34 -04:00
e512b8f7ef
Removed hardcoded USD symbol
2014-05-06 03:35:03 -04:00
5e1fedda45
Added Travis-CI badge
2014-05-06 01:28:21 -04:00
d0789da472
Copy the mail config file to prod for CI build as well. Duh.
2014-05-06 01:22:01 -04:00
fc21fc1aab
Put prod database file in app/config
2014-05-06 01:13:24 -04:00
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
f1cc547151
Copy DB config file for travis
2014-05-06 01:02:49 -04:00
snipe