 Brady Wetherington
|
db2552ac2f
|
blech
|
2015-08-11 22:32:59 -07:00 |
|
|
Brady Wetherington
|
9a3d2c5130
|
wat
|
2015-08-11 22:29:52 -07:00 |
|
|
Brady Wetherington
|
dd7864ac54
|
blech
|
2015-08-11 22:24:08 -07:00 |
|
|
snipe
|
754aa2d0d8
|
Merge branch 'travic-ci-misery' of github.com:snipe/snipe-it into travic-ci-misery
|
2015-08-11 22:19:14 -07:00 |
|
|
snipe
|
0ec8c87e8a
|
Slightly improved scenario description
|
2015-08-11 22:18:36 -07:00 |
|
|
Brady Wetherington
|
d6d685c15e
|
blech
|
2015-08-11 22:15:32 -07:00 |
|
|
Brady Wetherington
|
58ac3b3fa4
|
blech
|
2015-08-11 22:10:00 -07:00 |
|
|
Brady Wetherington
|
89844a4017
|
blech
|
2015-08-11 22:05:13 -07:00 |
|
|
Brady Wetherington
|
4ccf1a513f
|
blech
|
2015-08-11 22:02:07 -07:00 |
|
|
Brady Wetherington
|
6ca0f6bdc4
|
blech
|
2015-08-11 21:59:45 -07:00 |
|
|
Brady Wetherington
|
1caa7fe28d
|
yuck
|
2015-08-11 21:56:45 -07:00 |
|
|
Brady Wetherington
|
24f7f3a892
|
try something else
|
2015-08-11 21:52:53 -07:00 |
|
|
Brady Wetherington
|
f0c83ee253
|
trying to get phpinfo
|
2015-08-11 21:47:51 -07:00 |
|
|
snipe
|
32336e7370
|
Verbose on coceception
|
2015-08-11 21:10:05 -07:00 |
|
|
snipe
|
ba29a13249
|
Remove codecoverage stuff just in case it's messing things up
|
2015-08-11 21:07:52 -07:00 |
|
|
snipe
|
519ed11fc3
|
More poking and hoping
|
2015-08-11 21:03:17 -07:00 |
|
|
snipe
|
9949d68341
|
Try forcing test env in codeception.yml
|
2015-08-11 20:55:24 -07:00 |
|
|
snipe
|
4726639f85
|
Try switching back to the old instances
|
2015-08-11 20:49:23 -07:00 |
|
|
snipe
|
ce6e417a02
|
...
|
2015-08-11 20:45:59 -07:00 |
|
|
snipe
|
c3767e25e4
|
Changed hostname for travis
|
2015-08-11 20:42:32 -07:00 |
|
|
snipe
|
d059511840
|
Try to echo out the hostname so I can have some idea of WTF is happening
|
2015-08-11 20:40:05 -07:00 |
|
|
snipe
|
41838f1e89
|
Trying worker-linux-docker- because why the hell not
|
2015-08-11 20:26:44 -07:00 |
|
|
snipe
|
8624931a88
|
Comment out initial test for now
|
2015-08-11 20:23:16 -07:00 |
|
|
snipe
|
8840e57ae7
|
Trying 'testing-worker-linux*' as hostname since nothing else is working
|
2015-08-11 20:23:00 -07:00 |
|
|
snipe
|
16cb4f6d05
|
Removed AlisonMPB hostname
|
2015-08-11 19:54:14 -07:00 |
|
|
snipe
|
aa304375a6
|
Set default key
|
2015-08-11 19:54:03 -07:00 |
|
|
snipe
|
b22789aa59
|
Unbreaking the dashboard :(
|
2015-08-11 19:44:02 -07:00 |
|
|
snipe
|
f93e140ce1
|
Updated changelog
|
2015-08-11 19:43:51 -07:00 |
|
|
snipe
|
de238f1551
|
Set testing hostname
|
2015-08-11 19:00:08 -07:00 |
|
|
snipe
|
4247904f19
|
Resolving hostname problems
|
2015-08-11 18:52:42 -07:00 |
|
|
snipe
|
75852bdb8b
|
Derp
|
2015-08-11 18:40:16 -07:00 |
|
|
snipe
|
5cc1e7d3fe
|
Trying to set hostname back so tests won't fail
|
2015-08-11 18:37:37 -07:00 |
|
|
snipe
|
a98f4883be
|
Merge branch 'develop' of github.com:snipe/snipe-it into JoeFaux-AccessoryReport
|
2015-08-11 18:27:35 -07:00 |
|
|
snipe
|
d5a709a836
|
Improved testing stuff
|
2015-08-11 18:27:28 -07:00 |
|
|
snipe
|
4243270e7d
|
Merge pull request #1049 from JoeFaux/AccessoryReport
Accessory report
|
2015-08-11 17:31:37 -07:00 |
|
|
root
|
b576fce1f7
|
Modified files for accessory report.
|
2015-08-11 16:35:18 -07:00 |
|
|
root
|
d7313543ef
|
Changes to support an accessory report.
|
2015-08-11 16:32:48 -07:00 |
|
|
snipe
|
2636474120
|
Improved Welcome test
|
2015-08-11 15:57:58 -07:00 |
|
|
snipe
|
0c3b55a8b5
|
Upgrade to newer travis infrasructure
|
2015-08-11 15:49:25 -07:00 |
|
|
snipe
|
d7dd35a2f2
|
Removed generated test files accidentally commited
|
2015-08-11 15:30:43 -07:00 |
|
|
snipe
|
0c8e3809f2
|
Starter acceptance tests
|
2015-08-11 15:29:44 -07:00 |
|
|
snipe
|
4538bca29f
|
Allow 0 qty consumable
|
2015-08-11 14:34:54 -07:00 |
|
|
snipe
|
eeda4366a3
|
Removed cruft from debugging
|
2015-08-11 14:32:14 -07:00 |
|
|
snipe
|
fc31a828bc
|
Exclude Snipe-IT from search engines
|
2015-08-11 14:19:51 -07:00 |
|
|
snipe
|
88e10516a9
|
Updated footer links
|
2015-08-11 14:19:13 -07:00 |
|
|
snipe
|
481b905331
|
Fixes #1045 - allow 0 value for accessories
|
2015-08-11 14:01:13 -07:00 |
|
|
snipe
|
959df613ae
|
Updated language strings
|
2015-08-11 13:39:09 -07:00 |
|
|
snipe
|
c476eda868
|
Removed link on location until location view is fixed
|
2015-08-11 13:20:58 -07:00 |
|
|
snipe
|
b3249dcf48
|
Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
# app/controllers/admin/UsersController.php
# app/models/Model.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/users/index.blade.php
# composer.lock
|
2015-08-11 13:20:25 -07:00 |
|
|
snipe
|
242e6ff030
|
Updated composer lock
|
2015-08-11 12:40:13 -07:00 |
|