 snipe
|
be685467eb
|
Merge pull request #883 from madd15/patch-2
Update Category Types Array to include Consumable
|
2015-07-01 19:50:36 -07:00 |
|
|
madd15
|
55f544829d
|
Update Category Types Array to include Consumable
|
2015-07-01 17:28:58 +09:30 |
|
|
snipe
|
bb7ce83c48
|
Merge remote-tracking branch 'origin/develop' into 2.0
|
2015-06-30 22:42:00 -07:00 |
|
|
snipe
|
1d4cfcfd58
|
Only save uploaded logo if not in demo mode
|
2015-06-30 22:38:40 -07:00 |
|
|
snipe
|
6915987239
|
Added demo language string
|
2015-06-30 22:38:19 -07:00 |
|
|
snipe
|
3a44a7e8bb
|
Disable logo upload for demo
|
2015-06-30 22:38:12 -07:00 |
|
|
snipe
|
f2abbd0e8f
|
Deny editing users on demo
|
2015-06-30 22:10:23 -07:00 |
|
|
snipe
|
62f8d002e3
|
Temp commented out some stuff
|
2015-06-30 22:05:21 -07:00 |
|
|
snipe
|
0766ae2d17
|
Disallow group edit for demo
|
2015-06-30 22:04:48 -07:00 |
|
|
snipe
|
95920be8ea
|
Fixed weird commenting
|
2015-06-30 22:04:05 -07:00 |
|
|
snipe
|
588ff742fe
|
Add manufacturer to models listing for clarity
|
2015-06-30 19:15:43 -07:00 |
|
|
snipe
|
a8cb5c1e7d
|
Beginning QR mobile interface
|
2015-06-30 19:07:44 -07:00 |
|
|
snipe
|
1fb2878772
|
Updated activity report for consumables
|
2015-06-25 18:47:03 -07:00 |
|
|
snipe
|
84e130d6aa
|
Fixes #869 - compatibility mode for IE
|
2015-06-25 16:22:07 -07:00 |
|
|
snipe
|
edfa064fd4
|
Disable emailing imported users if demo mode
|
2015-06-23 18:38:21 -07:00 |
|
|
snipe
|
3caded990a
|
Added parent string
|
2015-06-23 18:32:06 -07:00 |
|
|
snipe
|
3bca2566d7
|
Added missing create/update consumable string
|
2015-06-23 16:35:38 -07:00 |
|
|
snipe
|
1aa4841868
|
Remove extra debugging
|
2015-06-23 16:30:29 -07:00 |
|
|
snipe
|
fc1e8a4e4e
|
Minor comment tweak
|
2015-06-23 15:05:21 -07:00 |
|
|
snipe
|
bf3cb73070
|
Include location ID on user import
|
2015-06-23 15:05:11 -07:00 |
|
|
snipe
|
d77e763f86
|
Change badge to label
|
2015-06-23 15:04:35 -07:00 |
|
|
snipe
|
8ef3d00f22
|
Fixed language string for users
|
2015-06-23 14:10:15 -07:00 |
|
|
snipe
|
5266c22890
|
Show consumable checkout date
|
2015-06-23 14:10:04 -07:00 |
|
|
snipe
|
26540b1aac
|
Updated bad data string
|
2015-06-23 14:02:01 -07:00 |
|
|
snipe
|
39a3b93537
|
Pagination on user history
|
2015-06-23 14:01:48 -07:00 |
|
|
snipe
|
ba13101f64
|
Bad data language string
|
2015-06-23 13:48:56 -07:00 |
|
|
snipe
|
ce55b7ab2f
|
Tightened up history snapshot on dashboard
|
2015-06-23 13:46:06 -07:00 |
|
|
snipe
|
28a9f90a72
|
Lazy eager load history for optimized queries
|
2015-06-23 13:44:49 -07:00 |
|
|
snipe
|
f2a2ccdab4
|
Nicer display for profile
|
2015-06-23 12:59:55 -07:00 |
|
|
snipe
|
f2e1ec0928
|
Fixed QR simple view route
|
2015-06-23 12:59:33 -07:00 |
|
|
snipe
|
17ca66f4a2
|
Added update string
|
2015-06-23 12:59:19 -07:00 |
|
|
snipe
|
a43f075ff0
|
Wider profile box view
|
2015-06-23 12:46:08 -07:00 |
|
|
snipe
|
c87d4ad801
|
Eager load dashboard queries
|
2015-06-23 11:52:18 -07:00 |
|
|
snipe
|
d94cc1f17d
|
Add consumables log
|
2015-06-23 11:52:07 -07:00 |
|
|
snipe
|
f30285eaea
|
Added text string for consumable name
|
2015-06-23 11:39:28 -07:00 |
|
|
snipe
|
20d35953f1
|
Remove consumable category
|
2015-06-23 11:39:17 -07:00 |
|
|
snipe
|
537630bae4
|
Removed unneeded stylesheet
|
2015-06-23 11:33:31 -07:00 |
|
|
snipe
|
85d6b062f3
|
Fixed checkbox alignment
|
2015-06-23 11:32:32 -07:00 |
|
|
snipe
|
74a9a176e9
|
New language strings
|
2015-06-23 10:25:44 -07:00 |
|
|
snipe
|
94f8c61720
|
Fixes #280, #64 and #860 - added license expiration alert
|
2015-06-23 01:52:06 -07:00 |
|
|
snipe
|
75b9b70a86
|
Fix email field so it's nullable, fix app command to add user
|
2015-06-23 00:11:54 -07:00 |
|
|
snipe
|
2e585f9cd2
|
Fixes #839 - bad seed data
|
2015-06-23 00:11:06 -07:00 |
|
|
snipe
|
edddf6ae80
|
Fixes #833 - remove status label field if asset is checked out
|
2015-06-22 20:01:02 -07:00 |
|
|
snipe
|
ea0f2c5f34
|
Fixes #833 - remove status label field if asset is checked out
|
2015-06-22 20:00:28 -07:00 |
|
|
snipe
|
826d3ccae8
|
Eager loading user info
|
2015-06-22 17:57:55 -07:00 |
|
|
snipe
|
fd7d4eb3f2
|
Removed checkin for consumables
|
2015-06-22 17:57:44 -07:00 |
|
|
snipe
|
e8e0c7bfe4
|
Missing filetype info string
|
2015-06-22 17:57:21 -07:00 |
|
|
snipe
|
ccdda7b8e8
|
Missing reassignable string
|
2015-06-22 17:57:09 -07:00 |
|
|
snipe
|
9abafba180
|
Updates to consumables view
|
2015-06-22 17:56:58 -07:00 |
|
|
snipe
|
2ed47a6089
|
Removed old file
|
2015-06-22 17:56:42 -07:00 |
|