 snipe
|
26e081a2cb
|
Fixes #909 again, because math is super hard
|
2015-07-27 15:26:53 -07:00 |
|
|
snipe
|
66a198a175
|
Merge pull request #966 from madd15/patch-2
Request #961 - Clone button on license list view
|
2015-07-27 15:07:52 -07:00 |
|
|
madd15
|
7aba5f3a84
|
Request #961 - Clone button on license list view
|
2015-07-28 07:33:51 +09:30 |
|
|
snipe
|
8d48fddac4
|
Merge pull request #956 from madd15/patch-1
Fix missing ]
|
2015-07-27 10:27:53 -07:00 |
|
|
snipe
|
8b5de894df
|
Updated language files
|
2015-07-27 10:24:21 -07:00 |
|
|
snipe
|
5781a01311
|
Added English, Indonesian
|
2015-07-27 10:24:08 -07:00 |
|
|
snipe
|
de1adf227b
|
New language files
|
2015-07-27 10:18:40 -07:00 |
|
|
madd15
|
5e7bfe314a
|
Fix missing ]
|
2015-07-27 21:20:19 +09:30 |
|
|
snipe
|
08ce08db62
|
Missing language strings for accept/decline
|
2015-07-26 23:01:31 -07:00 |
|
|
snipe
|
56504e07c9
|
More consistent language
|
2015-07-26 22:55:09 -07:00 |
|
|
snipe
|
a901a648af
|
Fixes #875 - allow user to decline asset and check asset back in if declined
|
2015-07-26 22:53:48 -07:00 |
|
|
snipe
|
a099d16714
|
Only send email if an email address was given
|
2015-07-26 22:08:26 -07:00 |
|
|
snipe
|
464c83599b
|
Nicer validation display on login screen
|
2015-07-26 22:01:45 -07:00 |
|
|
snipe
|
c78355e39a
|
Cleaned up login screen layout
|
2015-07-26 21:58:03 -07:00 |
|
|
snipe
|
bc7c456f99
|
Added decline route
|
2015-07-26 21:22:28 -07:00 |
|
|
snipe
|
4f07818a2d
|
Only activate "email users" checkbox if there is an email address given for the user
|
2015-07-26 21:22:09 -07:00 |
|
|
snipe
|
979212b2ed
|
Sans serif in emails
|
2015-07-26 21:21:52 -07:00 |
|
|
snipe
|
b32e3a3475
|
Shwo username instead of email
|
2015-07-26 21:21:42 -07:00 |
|
|
snipe
|
67e18cb110
|
Updates for switch to username
|
2015-07-26 19:56:03 -07:00 |
|
|
snipe
|
6a5777816c
|
Pulled extra route resources that weren't being used
|
2015-07-26 17:51:18 -07:00 |
|
|
snipe
|
2b2e6a8829
|
Additional localization strings
|
2015-07-25 00:20:17 -07:00 |
|
|
snipe
|
5701b4d38e
|
Return accessories as well
|
2015-07-25 00:05:59 -07:00 |
|
|
snipe
|
23866bce26
|
Use redirect to route instead of back because POST
|
2015-07-24 23:08:33 -07:00 |
|
|
snipe
|
ac5dd0dbf9
|
Remove unique constraint on email
|
2015-07-24 23:05:11 -07:00 |
|
|
snipe
|
0f0dab556d
|
Fixes #807 - bad link for subfolders
|
2015-07-24 22:48:29 -07:00 |
|
|
snipe
|
6dea227c3e
|
Fixes #851 - bulk user delete
|
2015-07-24 22:37:15 -07:00 |
|
|
snipe
|
cf3619d766
|
Fixes #937 - bug in which type of asset
|
2015-07-24 18:09:11 -07:00 |
|
|
snipe
|
59b739c1c4
|
Fixes #902 - redirect to group listing page after group create
|
2015-07-24 17:43:33 -07:00 |
|
|
snipe
|
59963b88f5
|
Fixes #941 - looser restrictions on alpha_space custom validator
|
2015-07-24 17:29:47 -07:00 |
|
|
snipe
|
7d67b6a9ae
|
Fixed forgotten password
|
2015-07-24 17:16:50 -07:00 |
|
|
snipe
|
e944b2d1c3
|
Fixed blade path
|
2015-07-24 16:56:55 -07:00 |
|
|
snipe
|
442db4b5c8
|
Removed duplicate routes from previous merge
|
2015-07-24 16:56:44 -07:00 |
|
|
snipe
|
991a364a3d
|
Updated form to use username
|
2015-07-24 16:56:31 -07:00 |
|
|
snipe
|
eaf077f807
|
Fixes #946 - navbar custom color not working in FF
|
2015-07-24 16:29:54 -07:00 |
|
|
snipe
|
fbb55c14d6
|
Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
# app/controllers/admin/AssetsController.php
|
2015-07-24 15:56:10 -07:00 |
|
|
snipe
|
e4bee3d372
|
Merge pull request #951 from madd15/fixes-1
Fix asset view duplicate file uploads and layout
|
2015-07-24 15:12:04 -07:00 |
|
|
snipe
|
42694f2e9f
|
Merge pull request #950 from madd15/Feature-Checkin-Emails
Feature Checkin Emails #709
|
2015-07-24 15:11:22 -07:00 |
|
|
madd15
|
2835905398
|
Fix dup file uploads and layout
|
2015-07-24 12:24:10 +09:30 |
|
|
madd15
|
f9c7022bcc
|
Add checkin_email()
|
2015-07-24 12:01:21 +09:30 |
|
|
madd15
|
60d05e1ae1
|
Add checkin_email()
|
2015-07-24 11:58:09 +09:30 |
|
|
madd15
|
b918ea88cc
|
Add checkin email template
|
2015-07-24 10:29:44 +09:30 |
|
|
madd15
|
e8c8509ed3
|
Add checkin_email Lang
|
2015-07-24 10:25:52 +09:30 |
|
|
madd15
|
42e101291e
|
Add Email on Checkin Field
|
2015-07-24 10:25:11 +09:30 |
|
|
madd15
|
00bcae7feb
|
Add email to postCheckin
|
2015-07-24 10:24:14 +09:30 |
|
|
madd15
|
6d96d6cba4
|
Add email to postCheckin
|
2015-07-24 10:22:54 +09:30 |
|
|
madd15
|
e3f0815012
|
Add Checkin_email to Create and Edit
|
2015-07-24 10:21:51 +09:30 |
|
|
madd15
|
f154692dad
|
Add Checkin_email to Catergories Table
|
2015-07-24 10:20:50 +09:30 |
|
|
snipe
|
e779bf52d1
|
Merge pull request #949 from madd15/patch-1
Added on #944 - Additional Email Info
|
2015-07-23 17:03:43 -07:00 |
|
|
madd15
|
d62d6ebf05
|
Add extra fields for email
|
2015-07-24 09:28:17 +09:30 |
|
|
madd15
|
e4277b47e8
|
Add extra fields for email
|
2015-07-24 09:27:44 +09:30 |
|