2004 Commits

Author SHA1 Message Date
Adolfo Gómez García
6bbd8d1321 Merge remote-tracking branch 'origin/v2.2' 2018-03-16 09:53:49 +01:00
Adolfo Gómez García
1bd56debb9 Added reset to vdi 2018-03-16 09:51:55 +01:00
Adolfo Gómez García
83ad9141a8 Merge remote-tracking branch 'origin/v2.2' 2018-03-16 09:50:29 +01:00
Adolfo Gómez García
a1ed512453 fixes from merge 2018-03-16 09:43:01 +01:00
Adolfo Gómez García
4641fde008 Added reset to vdi 2018-03-16 09:37:04 +01:00
Adolfo Gómez García
1d3d79c562 fix for "reset" capacity 2018-03-16 06:15:19 +01:00
Adolfo Gómez García
33600bda6e Fixed rootless 2018-03-14 15:23:44 +01:00
Adolfo Gómez García
e4807cf648 sets "allow_users_reset" to false on save if service does not supports
it.
2018-03-14 09:51:17 +01:00
Adolfo Gómez García
b9cb82c054 Merge remote-tracking branch 'origin/v2.2' 2018-03-14 08:18:06 +01:00
Adolfo Gómez García
92de41d410 * Added support for "reset" services that support it.
Right now, we will test on enterprise this feature.
2018-03-14 08:03:23 +01:00
Adolfo Gómez García
ee72b65534 Merge from master guacamole updates 2018-03-12 07:21:22 +01:00
Adolfo Gómez
ca24954e8d
Merge pull request #20 from glyptodon/update-guac-version
Update to 0.9.14 version of Apache Guacamole APIs.
2018-03-12 07:17:45 +01:00
Michael Jumper
b30f9334c5 Automatically reconnect after network errors (see upstream commit apache/guacamole-client@ecf506e). 2018-03-11 21:58:20 -07:00
Michael Jumper
a8e384cb43 Add error strings for status codes added upstream via GUACAMOLE-208 (see upstream commits apache/guacamole-client@dd6964a and apache/guacamole-client@ee4f8cf). 2018-03-11 21:55:47 -07:00
Michael Jumper
5136d013c2 Update to 0.9.14 version of Apache Guacamole APIs. 2018-03-11 21:33:30 -07:00
Adolfo Gómez García
374c35ea8c Merge remote-tracking branch 'origin/v2.2' 2018-03-09 11:19:17 +01:00
Adolfo Gómez García
dba5e4267a Fixed translations 2018-03-09 11:19:01 +01:00
Adolfo Gómez García
fb757fc1fd Merge remote-tracking branch 'origin/v2.2' 2018-03-08 20:33:21 +01:00
Adolfo Gómez García
f6d78201cb fixed cache in case of use in middle of "lock tables"... 2018-03-08 20:29:28 +01:00
Adolfo Gómez García
952cb1c3f7 Merge remote-tracking branch 'origin/v2.2' 2018-03-06 11:08:58 +01:00
Adolfo Gómez García
8162230f23 Fixed lazy trans on os managers 2018-03-06 11:06:40 +01:00
Adolfo Gómez García
f73de2f4c3 Merge remote-tracking branch 'origin/v2.2' 2018-03-05 13:59:40 +01:00
Adolfo Gómez García
bfb96b6d9f Translations 2018-03-05 13:59:20 +01:00
Adolfo Gómez García
f9316b230b Merge remote-tracking branch 'origin/v2.2' 2018-03-05 13:41:33 +01:00
Adolfo Gómez García
b37c87afb5 Added new "on logout" state 2018-03-05 13:38:40 +01:00
Adolfo Gómez García
8913d152e7 cosmetic 2018-03-05 13:37:33 +01:00
Adolfo Gómez García
8141d3bbdb Updated go fontawasome 5 2018-03-04 02:38:48 +01:00
Adolfo Gómez García
05f2f816e0 a couple of fixes for grunt-copy on user space template 2018-03-03 10:53:39 +01:00
Adolfo Gómez García
0c1313af8f Merge remote-tracking branch 'origin/v2.2' 2018-03-02 18:36:43 +01:00
Adolfo Gómez García
df98efc2da translations 2018-03-02 18:35:02 +01:00
Adolfo Gómez García
7320ba0e6d Added to "use" log the serviceName & the pool name 2018-03-02 18:09:12 +01:00
Adolfo Gómez García
9f89cc1482 Merge remote-tracking branch 'origin/v2.2' 2018-03-02 06:01:30 +01:00
Adolfo Gómez García
4271be9340 Added a couple of logs due to the fact that maybe in some moment we
change a datetime from db/uds and may "force" tasks
2018-03-02 06:00:04 +01:00
Adolfo Gómez García
8904cc9bc0 fixing migrations from 2.2 2018-03-02 05:47:17 +01:00
Adolfo Gómez García
e1efa5d5ed fixing migrations from 2.2 2018-03-02 05:46:56 +01:00
Adolfo Gómez García
b56b3ef6d8 Fixed & remove "auto_add_time" etc.. 2018-03-02 05:25:42 +01:00
Adolfo Gómez García
eacffbe20b Merge remote-tracking branch 'origin/v2.2' 2018-03-02 01:02:08 +01:00
Adolfo Gómez García
5f74c7fca8 * Changed the "persitent" management on case of new publication.
Now, if a machine is considered "persistent", on a new publication, UDS
Will not remove assigned services, nor will remove services of old
publications on logout.
2018-03-02 00:51:16 +01:00
Adolfo Gómez García
4a171b6aa5 Merge remote-tracking branch 'origin/v2.2' 2018-02-28 19:50:48 +01:00
Adolfo Gómez García
0bd09e70bf fixed README.txt 2018-02-28 19:50:27 +01:00
Adolfo Gómez García
52345d6970 Forgot the moderm folder :) 2018-02-26 07:30:22 +01:00
Adolfo Gómez García
697a07dda8 Working on templates 2018-02-26 07:11:59 +01:00
Adolfo Gómez García
ccd2215cf6 Finally, we are going to try translation to typescript, at least on user space for now. 2018-02-25 09:05:02 +01:00
Adolfo Gómez García
c2e5b705a7 Advanced a bit 2018-02-24 23:48:42 +01:00
Adolfo Gómez García
30006b90d4 Advancing on base template dev environment 2018-02-24 10:10:26 +01:00
Adolfo Gómez García
9d2abc83bf Added by now the bootstrap-select picerk beta. To be replace with stable & npm package when stable 2018-02-24 10:09:44 +01:00
Adolfo Gómez García
9e86df21e5 advancing on base templates. 2018-02-24 09:09:14 +01:00
Adolfo Gómez García
367b9ca26f Advancing on auto builders 2018-02-24 08:45:45 +01:00
Adolfo Gómez García
3be93f2dcf Testing aroung with typescripy/javascript. For now, will keep coffeescript, too many changes for using typescript and no time ;-) 2018-02-24 06:21:13 +01:00
Adolfo Gómez García
5d8a63e729 base empty template for user html 2018-02-24 05:38:23 +01:00