James Muehlner
|
18565d171e
|
GUACAMOLE-136: Merge password reset flow fix for 2FA.
|
2016-12-05 20:43:39 -08:00 |
|
Michael Jumper
|
6eda36cd4e
|
GUACAMOLE-136: Ensure field template is in DOM prior to invoking controller.
|
2016-12-05 20:16:57 -08:00 |
|
Michael Jumper
|
4a1ffbfdcc
|
GUACAMOLE-136: Move password reset flow into own function. Invoke from getUserContext(), not authenticateUser(), such that secondary authentication factors have a chance to invalidate the auth attempt prior to password reset.
|
2016-12-05 20:13:59 -08:00 |
|
James Muehlner
|
32e5c3e680
|
Merge 0.9.10-incubating changes back to master.
|
2016-12-03 17:39:07 -08:00 |
|
James Muehlner
|
021c18757d
|
GUACAMOLE-132: Merge .gitignore fix.
|
2016-12-03 17:38:13 -08:00 |
|
Michael Jumper
|
ebb1fb12d3
|
GUACAMOLE-132: Include ALL .gitignore in source .tar.gz, not just top-level.
|
2016-12-03 17:27:17 -08:00 |
|
James Muehlner
|
ef092ba2dc
|
Merge 0.9.10-incubating release-specific changes back to master.
|
2016-12-03 13:03:09 -08:00 |
|
James Muehlner
|
5b7d030daa
|
GUACAMOLE-133: Merge remaining licenses for bundled software in auth extensions.
|
2016-12-03 13:00:59 -08:00 |
|
Michael Jumper
|
40f33649fe
|
GUACAMOLE-133: Include LICENSE, NOTICE, and DISCLAIMER within .tar.gz of guacamole-auth-noauth.
|
2016-12-02 21:06:33 -08:00 |
|
Michael Jumper
|
b99626fd51
|
GUACAMOLE-133: Add licenses for bundled dependencies of guacamole-auth-jdbc.
|
2016-12-02 21:06:33 -08:00 |
|
Michael Jumper
|
81d3cc20c9
|
GUACAMOLE-133: Add licenses for bundled dependencies of guacamole-auth-ldap.
|
2016-12-02 21:06:16 -08:00 |
|
Michael Jumper
|
90434b7960
|
GUACAMOLE-133: Rename "dependencies" directory of licenses to "bundled". Add README.
|
2016-12-02 20:32:06 -08:00 |
|
James Muehlner
|
c29e6ba464
|
Merge 0.9.10-incubating changes back to master.
|
2016-12-02 19:40:42 -08:00 |
|
James Muehlner
|
315b0d00cc
|
GUACAMOLE-133: Merge LICENSE documentation for all Guacamole dependencies.
|
2016-12-02 19:35:35 -08:00 |
|
Michael Jumper
|
110ebf64e2
|
GUACAMOLE-133: Document all dependencies of Guacamole within LICENSE.
|
2016-12-02 18:18:56 -08:00 |
|
James Muehlner
|
c194e04894
|
Merge release-specific changes for 0.9.10-incubating back to master.
|
2016-12-02 15:37:35 -08:00 |
|
James Muehlner
|
8f4a4db46f
|
GUACAMOLE-133: Merge exclusion of redundant StAX transitive dependency.
|
2016-12-02 15:27:23 -08:00 |
|
James Muehlner
|
ee69f66300
|
GUACAMOLE-133: Merge removal of pointless SLF4J dependency for JDBC auth extension.
|
2016-12-02 15:25:23 -08:00 |
|
Michael Jumper
|
621af69f87
|
GUACAMOLE-133: Exclude StAX dependency, which is part of Java 6.
|
2016-12-02 14:25:41 -08:00 |
|
Michael Jumper
|
348bbbf53f
|
GUACAMOLE-133: Remove unnecessary bundled SLF4J from JDBC auth.
|
2016-12-02 13:46:20 -08:00 |
|
James Muehlner
|
4bab81a94b
|
GUACAMOLE-131: Merge fix for bad merge.
|
2016-11-29 09:47:47 -08:00 |
|
Michael Jumper
|
e385bfcde0
|
GUACAMOLE-131: Re-remove JavaScript libraries which were mistakenly re-added during merge conflict resolution.
|
2016-11-28 22:51:48 -08:00 |
|
James Muehlner
|
f1edb9ffd1
|
Merge new changes for 0.9.10-incubating back to master.
|
2016-11-28 22:27:36 -08:00 |
|
James Muehlner
|
119fae261f
|
GUACAMOLE-131: Merge webjars migration for javascript dependencies.
|
2016-11-28 22:18:13 -08:00 |
|
James Muehlner
|
15ddcf2922
|
GUACAMOLE-132: Merge .gitignore fix for Apache RAT.
|
2016-11-28 21:06:34 -08:00 |
|
Michael Jumper
|
bc7b7c88a0
|
GUACAMOLE-132: Explicitly include .gitignore in the source archive.
|
2016-11-28 17:41:12 -08:00 |
|
Michael Jumper
|
9175ebf5d0
|
GUACAMOLE-131: Migrate to Webjars for JavaScript library dependencies. Upgrade messageformat.js to 1.0.2, which is now MIT-licensed.
|
2016-11-28 17:25:03 -08:00 |
|
James Muehlner
|
367af31f7b
|
GUACAMOLE-130: Merge new Norwegian translations.
|
2016-11-27 11:21:09 -08:00 |
|
James Muehlner
|
4e788d6adf
|
GUACAMOLE-112: Merge messageformat version upgrade.
|
2016-11-27 11:18:34 -08:00 |
|
Michael Jumper
|
9387961c23
|
GUACAMOLE-112: Upgrade messageformat.js to 1.0.2, which is now MIT-licensed.
|
2016-11-26 20:27:39 -08:00 |
|
Michael Jumper
|
cc269498c0
|
GUACAMOLE-130: Remove reference to non-existent keyboard layout.
|
2016-11-26 20:00:41 -08:00 |
|
Arild Ringøy
|
49b697a75a
|
GUACAMOLE-130: Add Norwegian translation.
|
2016-11-26 20:00:03 -08:00 |
|
James Muehlner
|
047c77592d
|
GUACAMOLE-116: Merge deminification of lodash in source.
|
2016-11-14 16:21:04 -08:00 |
|
Michael Jumper
|
629fa02113
|
GUACAMOLE-116: Replace lodash.js with non-minified version.
|
2016-11-14 15:30:37 -08:00 |
|
James Muehlner
|
24e201b219
|
Merge release-specific changes for 0.9.10-incubating back to master.
|
2016-11-13 11:30:56 -08:00 |
|
James Muehlner
|
84a6dc8c48
|
GUACAMOLE-119: Merge integration of Apache Rat into client and associated new license notices.
|
2016-11-13 11:22:32 -08:00 |
|
James Muehlner
|
b0f73bb4d7
|
GUACAMOLE-119: Merge integration of Apache Rat into client and associated new license notices.
|
2016-11-13 10:49:49 -08:00 |
|
Michael Jumper
|
94fcd068a4
|
GUACAMOLE-119: Include guacamole-example in the build.
|
2016-11-12 18:41:00 -08:00 |
|
Michael Jumper
|
d78a2d9dad
|
GUACAMOLE-119: Move NetBeans-specific .gitignore entries to guacamole project.
|
2016-11-12 18:16:54 -08:00 |
|
Michael Jumper
|
b483d8afef
|
GUACAMOLE-119: Add Apache license boilerplate to guacConfigGroup LDAP schema.
|
2016-11-12 18:16:52 -08:00 |
|
Michael Jumper
|
d19c078280
|
GUACAMOLE-119: Add Apache license boilerplate to example config files.
|
2016-11-12 18:16:50 -08:00 |
|
Michael Jumper
|
44516e4de4
|
GUACAMOLE-119: Add Apache license boilerplate to example project. Remove META-INF.
|
2016-11-12 18:16:47 -08:00 |
|
Michael Jumper
|
4241e8c13f
|
GUACAMOLE-119: Add Apache license boilerplate to project assembly XMLs.
|
2016-11-12 18:16:43 -08:00 |
|
Michael Jumper
|
322d2ba144
|
GUACAMOLE-119: Add Apache license boilerplate to pom.xml.
|
2016-11-12 18:16:27 -08:00 |
|
Michael Jumper
|
27bb5632f5
|
GUACAMOLE-119: Add Apache RAT validation to build.
|
2016-11-12 18:16:03 -08:00 |
|
James Muehlner
|
0227ccd96e
|
GUACAMOLE-70: Merge changes allowing access restriction to DB users only.
|
2016-11-12 17:42:10 -08:00 |
|
Michael Jumper
|
5c800b1d89
|
GUACAMOLE-70: Allow access to be restricted to strictly the users in the database.
|
2016-11-11 17:34:29 -08:00 |
|
James Muehlner
|
d455dbaae7
|
GUACAMOLE-116: Merge unminification of checked-in angular source.
|
2016-11-11 16:06:32 -08:00 |
|
James Muehlner
|
d3d4fddaf9
|
GUACAMOLE-99: Merge change to support linking docker container to guacd.
|
2016-11-11 16:02:44 -08:00 |
|
Michael Jumper
|
96b2601581
|
GUACAMOLE-116: Replace angular.min.js with non-minified angular.js.
|
2016-11-11 15:54:00 -08:00 |
|