Commit Graph

2245 Commits

Author SHA1 Message Date
Adolfo Gómez García
2bd4f3d8e5 Merge remote-tracking branch 'origin/v2.2'
# Conflicts:
#	server/src/uds/REST/methods/op_calendars.py
2019-01-18 08:34:47 +01:00
Adolfo Gómez García
efb3965d76 Fixed calendar action can create "empty" actions 2019-01-17 18:20:51 +01:00
Adolfo Gómez García
1a0c27f23c Fixes for new administration interface 2019-01-16 10:04:21 +01:00
Adolfo Gómez García
1b0f406de4 fixes for python 3.5 2019-01-14 10:34:51 +01:00
Adolfo Gómez García
21a5f4de09 Merge remote-tracking branch 'origin/v2.2' 2019-01-11 05:58:36 +01:00
Adolfo Gómez García
4778f5f931 fix translations 2019-01-11 05:57:51 +01:00
Adolfo Gómez García
29d0c242f7 Merge remote-tracking branch 'origin/v2.2' 2019-01-10 12:41:32 +01:00
Adolfo Gómez García
78656ed4a2 fixed 2019-01-10 12:40:23 +01:00
Adolfo Gómez García
c9a08cf1a1 Merge remote-tracking branch 'origin/v2.2' 2019-01-10 11:10:11 +01:00
Adolfo Gómez García
278bcb87de Fixed translations 2019-01-10 11:06:38 +01:00
Adolfo Gómez García
690fd7c9cc Added datepicker for chinese 2019-01-09 20:16:25 +01:00
Adolfo Gómez García
7b51bb7985 Added chinese lang to translations on sample file 2019-01-09 20:10:16 +01:00
Adolfo Gómez García
6f81892324 renamed chinese to zh_hans (traditional chinese) 2019-01-09 20:03:41 +01:00
Adolfo Gómez García
f603bd6c8f Merge remote-tracking branch 'origin/v2.2' 2019-01-09 13:53:28 +01:00
Adolfo Gómez García
a496fd97f1 added autotrasnlations for chinesse 2019-01-09 13:53:07 +01:00
Adolfo Gómez García
77bf401bd5 added eu autotranslations 2019-01-09 13:31:29 +01:00
Adolfo Gómez García
812e863e7f translations 2019-01-09 12:29:39 +01:00
Adolfo Gómez García
cd2d529524 Fixed IOS crash 2019-01-08 10:04:37 +01:00
Adolfo Gómez
445bbc6ee6
Merge pull request #37 from m-khan-glyptodon/Safari-Crash-Fix
IOS Safari crash fix
2019-01-08 09:54:33 +01:00
m-khan-glyptodon
cc9cf15c69 Added further documentation to max width and max height functions 2019-01-07 16:45:55 -08:00
m-khan-glyptodon
42ded5c382 Added documentation for the max height and max width functions 2019-01-07 16:45:55 -08:00
m-khan-glyptodon
8df513fbd3 Added scroll height and scroll width cap to fix ios safari crash 2019-01-07 15:08:42 -08:00
Adolfo Gómez García
164654143d Merge remote-tracking branch 'origin/v2.2' 2018-12-21 13:55:32 +01:00
Adolfo Gómez García
d9ad218e41 Merge remote-tracking branch 'origin/v2.2' 2018-12-21 13:55:20 +01:00
Adolfo Gómez García
8f76363b27 realname fixed on creation 2018-12-21 13:53:52 +01:00
Adolfo Gómez García
6a05403464 Added realname 2018-12-21 10:52:42 +01:00
Adolfo Gómez García
ac0eefc683 Merge remote-tracking branch 'origin/v2.2' 2018-12-20 16:46:07 +01:00
Adolfo Gómez García
43398cd125 Fixed user edition (user assignation) 2018-12-20 16:38:00 +01:00
Adolfo Gómez García
1da058cec6 Upgrading to new admin interface 2018-12-19 12:43:38 +01:00
Adolfo Gómez García
c5d1702758 Fixes for python 3 2018-12-18 10:52:03 +01:00
Adolfo Gómez García
fb818f06a5 fixes 2018-12-10 11:42:23 +01:00
Adolfo Gómez García
eae79364b8 Merge remote-tracking branch 'origin/v2.2' 2018-12-03 10:49:21 +01:00
Adolfo Gómez García
49564147a3 fixed on user services rest 2018-12-03 10:49:15 +01:00
Adolfo Gómez García
481eca7d16 Removed unused imports 2018-12-03 10:46:05 +01:00
Adolfo Gómez García
e382bfa19b Removed transaction from calendar actions execution. Not needed in fact. 2018-12-03 10:45:31 +01:00
Adolfo Gómez García
9094547f22 Testing windows 8 idle 2018-12-03 08:27:02 +01:00
Adolfo Gómez García
c2bd664545 translations 2018-11-29 10:18:59 +01:00
Adolfo Gómez García
04b68401cf minor fixes 2018-11-28 07:12:35 +01:00
Adolfo Gómez García
6300da4697 Merge remote-tracking branch 'origin/v2.2' 2018-11-27 11:59:40 +01:00
Adolfo Gómez García
8b4485d533 translations 2018-11-27 11:57:22 +01:00
Adolfo Gómez García
94501b1106 Merge remote-tracking branch 'origin/v2.2' 2018-11-27 11:18:24 +01:00
Adolfo Gómez García
696ad047a3 Merge remote-tracking branch 'origin/v2.2' 2018-11-27 11:18:14 +01:00
Adolfo Gómez García
682ce422b6 Translations 2018-11-27 11:17:49 +01:00
Adolfo Gómez García
906824cafc Fixups 2018-11-26 13:44:48 +01:00
Adolfo Gómez García
6f6633b819 Merge remote-tracking branch 'origin/v2.2' 2018-11-26 11:44:39 +01:00
Adolfo Gómez García
eb6065b203 Fixed so now services with no transports are not provided to template 2018-11-26 11:44:07 +01:00
Adolfo Gómez García
9451889bb3 Removed execution of "reg", using "winreg" instead (_winreg on 2.7) 2018-11-23 11:39:45 +01:00
Adolfo Gómez García
8120ae5c92 Final fix for no check redirections 2018-11-23 11:09:06 +01:00
Adolfo Gómez García
d1bb018dff Added "no warning for redirections' to remote connection 2018-11-23 11:07:58 +01:00
Adolfo Gómez García
694d60cb88 Some minor fixes 2018-11-23 10:55:00 +01:00