Commit graph

3368 commits

Author SHA1 Message Date
Zanz2
07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Zanz2
a0c6a0c407 changed name of data attribute 2018-09-07 15:33:38 +02:00
Zanz2
4e55fdc9b5 Merge branch 'zz_in_app_tooltips_help_sci2662' of https://github.com/Zanz2/scinote-web into zz_in_app_tooltips_help_sci2662 2018-08-21 12:09:05 +02:00
Zanz2
601335a807 Fixed non .js errors hound 2018-08-21 12:08:14 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
36cca3d6aa Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax 2018-08-21 11:11:25 +02:00
Zanz2
91f112dc38 Saving minor changes, deleted comments, stuck at drag n drop 2018-08-20 13:45:43 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Zanz2
8c492e1491 started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute 2018-08-17 16:03:49 +02:00
Zanz2
e1cadfc75e saving work, removed testing buttons 2018-08-17 11:52:10 +02:00
Zanz2
637c7dfb19 modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic 2018-08-17 11:33:44 +02:00
Alex Kriuchykhin
422baaf64a
Merge pull request #1258 from okriuchykhin/ok_SCI_2619
Add team deletion service [SCI-2619]
2018-08-17 10:56:11 +02:00
Zanz2
a09834db6a testing, made new popover designs 2018-08-16 16:10:19 +02:00
Zanz2
d2373980d4 Testing out new popover 2018-08-16 15:07:59 +02:00
Zanz2
9fd02e71c9 initial popover/tooltip config 2018-08-16 13:04:42 +02:00
Oleksii Kriuchykhin
ca6fc84ae2 Remove duplicated task outputs deletion [SCI-2619] 2018-08-10 16:43:40 +02:00
Zanz2
27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621
Fixes duplicate checkbox entries in activity log [SCI-1621]
2018-08-09 11:50:34 +02:00
Alex Kriuchykhin
6004f8411b
Merge pull request #1260 from okriuchykhin/ok_SCI_2611
Add GET teams and team API endpoints [SCI-2611][SCI-2612]
2018-08-08 16:59:42 +02:00
mlorb
a6dd577b4e fix time zone selector 2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin
298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
okriuchykhin
29f0f2afeb
Merge pull request #1257 from okriuchykhin/ok_SCI_2609
Refactor tasks tree API endpoint [SCI-2609]
2018-08-02 17:10:55 +02:00
okriuchykhin
bb5d029c30
Merge pull request #1251 from okriuchykhin/ok_SCI_2253
Upgrade to Turbolinks 5 [SCI-2253]
2018-08-02 14:43:19 +02:00
Oleksii Kriuchykhin
8f5d30ad1f Fix load protocol modal [SCI-2253] 2018-08-02 14:35:19 +02:00
okriuchykhin
3503eb775b
Merge pull request #1254 from okriuchykhin/ok_SCI_2601
Fix files search results display [SCI-2601]
2018-08-02 11:53:02 +02:00
okriuchykhin
dd9090efef
Merge pull request #1253 from okriuchykhin/ok_SCI_2608
Adds API authentication with Azure AD [SCI-2608]
2018-08-02 11:28:18 +02:00
Oleksii Kriuchykhin
38c36ab798 Fix modals handling with Turbolinks [SCI-2253] 2018-08-02 11:25:14 +02:00
okriuchykhin
6c49ecfd4c
Merge pull request #1250 from okriuchykhin/team_migration_fix
Fix team import service
2018-08-01 15:01:43 +02:00
okriuchykhin
53c287224b
Merge pull request #1247 from ZmagoD/zd_SCI_2489
move FirstTimeDataGenerator helper from applictaion controller [SCI-2489]
2018-07-31 14:33:51 +02:00
Oleksii Kriuchykhin
1c3f1a1a6c Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +02:00
Oleksii Kriuchykhin
22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin
26b0bd9e11 Refactor tasks tree API endpoint [SCI-2609] 2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin
5c999300b5 Fix avatar upload validators [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
812a3dcf7d Fix user profile edit form [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
10b86a9d05 Add data hook to settings/team page [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Oleksii Kriuchykhin
bc1cd39229 Add team deletion service [SCI-2619] 2018-07-27 13:34:13 +02:00
Oleksii Kriuchykhin
563005cf89 Fix files search results display [SCI-2601] 2018-07-26 09:55:18 +02:00
Oleksii Kriuchykhin
0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
Oleksii Kriuchykhin
3e7fc6720c Fix team import service 2018-07-20 16:10:45 +02:00
Zanz2
c6ef14290a Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again 2018-07-17 11:41:42 +02:00
Zanz2
887ddbfce3
Merge pull request #1229 from Zanz2/unify_match_case_sci1324
Fix protocol names are case insensitive unique [SCI-1324]
2018-07-17 08:22:03 +02:00
Luka Murn
f67b8d05c7
Merge pull request #1225 from okriuchykhin/ok_SCI_2534
Fix rendering permissions of inventory annotations [SCI-2534]
2018-07-13 15:18:59 +02:00
Luka Murn
f23cc36803
Merge pull request #1224 from ZmagoD/zd_SCI_2429
fixes setting sidebar teams link[fixes SCI-2429]
2018-07-13 14:55:24 +02:00
Luka Murn
de29ab1b11
Merge pull request #1234 from ZmagoD/zd_SCI_2581
adds missing js in experiment canvas view [fixes SCI-2581]
2018-07-13 14:54:59 +02:00
Luka Murn
752fb8dcd8
Merge pull request #1238 from ZmagoD/zd_SCI_2511
fixes smart annotation serch queries/dropdown item picker [fixes SCI-…
2018-07-13 14:54:42 +02:00
Luka Murn
13aab686b1
Merge pull request #1242 from ZmagoD/zd_SCI_2492
adds the ability to scroll to the active element in the navigation si…
2018-07-13 14:54:30 +02:00
Luka Murn
9b2f00cd5d
Merge pull request #1245 from ZmagoD/zd_SCI_2600
sanitizes the report name on repors index page [fixes SCI-2600]
2018-07-13 14:54:18 +02:00
zmagod
29e0ecbc89 move FirstTimeDataGenerator helper from applictaion controller 2018-07-11 11:19:39 +02:00