Zmago Devetak
|
692b31325b
|
Merge pull request #206 from ZmagoD/zd_SCI_561
Fixed assinement icon [fixes SCI-561]
|
2016-10-11 09:32:47 +02:00 |
|
zmagod
|
ea305b356a
|
fixes protocol steps [fixes SCI-548]
|
2016-10-11 09:10:12 +02:00 |
|
zmagod
|
42a30576e3
|
removed introductory popup [fixes SCI-534]
|
2016-10-11 08:33:50 +02:00 |
|
Luka Murn
|
448daab7c8
|
Merge pull request #207 from biosistemika/add-deface-hotfix
Merge hotfix 1.3.1 into master
|
2016-10-07 18:26:13 +02:00 |
|
zmagod
|
fe7b367eae
|
fixed hound
|
2016-10-07 15:25:53 +02:00 |
|
zmagod
|
130db6a2c3
|
fixed assignment icon [fixes SCI-561]
|
2016-10-07 12:27:44 +02:00 |
|
zmagod
|
32f03ec94c
|
Add Deface hooks
|
2016-10-06 16:47:36 +02:00 |
|
zmagod
|
0bdf77562d
|
add word-wrap to notrification index page [fixes SCI-556]
|
2016-10-06 13:49:24 +02:00 |
|
zmagod
|
de00a19dd9
|
fixes styling in settings preferences [SCI-553]
|
2016-10-06 13:22:44 +02:00 |
|
zmagod
|
5b3889c172
|
notification index images [fixes SCI-554]
|
2016-10-06 12:09:01 +02:00 |
|
Luka Murn
|
5c80c8a817
|
Add "no notifications" to dropdown & notifications index page
|
2016-10-05 16:58:21 +02:00 |
|
Luka Murn
|
877574e853
|
Add link to settings from both notification lists
|
2016-10-05 16:26:26 +02:00 |
|
Luka Murn
|
56d2240de5
|
Optimize data query in user_notification.rb
|
2016-10-05 16:21:13 +02:00 |
|
Oleksii Kriuchykhin
|
083a09c2f7
|
Add link to notifications index page
|
2016-10-05 16:13:05 +02:00 |
|
okriuchykhin
|
50f28fe883
|
Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442
Global notifications screen [SCI-442]
|
2016-10-05 16:01:41 +02:00 |
|
Oleksii Kriuchykhin
|
4e2ad1d5e6
|
Fix the issues after code review [SCI-442]
|
2016-10-05 15:54:31 +02:00 |
|
Oleksii Kriuchykhin
|
c783e9a03d
|
Code fix after rebase with latest master [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
d2b48e94bd
|
CSS color fix [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
868ffd03d6
|
JS code improvement [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
246dae4f46
|
Code style improvements according to hound [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
8907e54b49
|
Global notifications index page added [SCI-442]
|
2016-10-05 15:51:11 +02:00 |
|
Oleksii Kriuchykhin
|
8b5b0723d1
|
Initial code commit
|
2016-10-05 15:51:11 +02:00 |
|
Zmago Devetak
|
f3708bcac0
|
Merge pull request #191 from ZmagoD/zd_SCI_469_ver2
Comments date duplication
|
2016-10-05 15:47:42 +02:00 |
|
zmagod
|
b0f6b1f4d0
|
fixed comments action on project page
|
2016-10-05 15:39:54 +02:00 |
|
Zmago Devetak
|
eea310514a
|
Merge pull request #194 from ZmagoD/zd_SCI_531_533
Notification style fixes
|
2016-10-05 15:27:36 +02:00 |
|
zmagod
|
bca3d19562
|
fixed comment options dropdown position
|
2016-10-05 15:26:11 +02:00 |
|
Zmago Devetak
|
71ad5bf034
|
Merge pull request #190 from ZmagoD/zd_SCI_529
Prepare settings screen for notifications
|
2016-10-05 14:54:47 +02:00 |
|
Zmago Devetak
|
c547d8a07a
|
Merge pull request #195 from ZmagoD/zd_SCI_532
add word wrapping to notifications dropdown [fixes SCI-532]
|
2016-10-05 14:54:10 +02:00 |
|
zmagod
|
dfcbebbf4f
|
cleaned up bootstrap extension
|
2016-10-05 14:49:23 +02:00 |
|
okriuchykhin
|
bfa7e57bd8
|
Merge pull request #168 from okriuchykhin/ok_SCI-463
Fixes issue with unexpected notification windows [fixes SCI-463]
|
2016-10-05 14:45:23 +02:00 |
|
zmagod
|
9c7a690944
|
fixed type, fixed settings controller, fixes setting view on mobile devices
|
2016-10-05 14:33:22 +02:00 |
|
zmagod
|
cba4318185
|
add word wrapping to notifications dropdown [fixes SCI-532]
|
2016-10-05 13:22:33 +02:00 |
|
zmagod
|
5bf278298b
|
fixed navbar on sceens smaller than 1000px
|
2016-10-05 12:22:27 +02:00 |
|
zmagod
|
f9d956bbca
|
fix notifications number on [fixes SCI-531]
|
2016-10-05 11:50:57 +02:00 |
|
zmagod
|
c4f28c3649
|
made notification images bigger [fixes SCI-533]
|
2016-10-05 10:16:51 +02:00 |
|
zmagod
|
848beb5d4b
|
minor fix
|
2016-10-05 09:46:18 +02:00 |
|
zmagod
|
d7a4f85ba1
|
added links to notification project name and task
|
2016-10-05 09:40:44 +02:00 |
|
zmagod
|
d90f17d1eb
|
clean comments date duplication [fixes SCI-469]
|
2016-10-05 08:42:32 +02:00 |
|
zmagod
|
6229e6a3a1
|
styled notification settings button [fixes SCI-529]
|
2016-10-04 16:12:56 +02:00 |
|
zmagod
|
a68e7abc57
|
first run notification settings
|
2016-10-04 15:52:48 +02:00 |
|
Luka Murn
|
61cb9651c7
|
Merge pull request #188 from biosistemika/global-notifications
Global notifications
|
2016-10-04 08:30:50 +02:00 |
|
zmagod
|
c9bbab1004
|
added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users
|
2016-10-03 20:31:00 +02:00 |
|
mlorb
|
00b0f6ab07
|
Merge pull request #184 from mlorb/ml_sci_472
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
|
2016-10-03 17:20:45 +02:00 |
|
mlorb
|
153b692c0c
|
Merge pull request #181 from mlorb/ml_sci_321
Displaying more information for individual samples in Sample table [SCI-321]
|
2016-10-03 16:37:35 +02:00 |
|
Mojca Lorber
|
3b0185a45b
|
change title of modal
|
2016-10-03 16:33:58 +02:00 |
|
zmagod
|
0d23f05698
|
Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440
|
2016-10-03 16:14:22 +02:00 |
|
zmagod
|
36fb2713b3
|
start fixing comments dates
|
2016-10-03 16:10:20 +02:00 |
|
Zmago Devetak
|
84313a28a0
|
Merge pull request #186 from ZmagoD/zd_SCI_441_vol2
code notifications in toolbar
|
2016-10-03 16:09:04 +02:00 |
|
Zmago Devetak
|
91c7d8a952
|
Merge pull request #176 from ZmagoD/zd_SCI_474
Unify the comments
|
2016-10-03 15:26:17 +02:00 |
|
Oleksii Kriuchykhin
|
a39c948c5f
|
System notifications code rework
|
2016-10-03 15:21:26 +02:00 |
|
zmagod
|
77df0bc82c
|
cleans more comment link
|
2016-10-03 12:34:16 +02:00 |
|
zmagod
|
947096862d
|
fixed hound
|
2016-10-03 11:40:59 +02:00 |
|
zmagod
|
ea17182372
|
generate notifications [fixes SCI-440]
|
2016-10-03 11:37:29 +02:00 |
|
Mojca Lorber
|
093fbd6b8e
|
fixes hound again
|
2016-10-03 10:40:32 +02:00 |
|
Mojca Lorber
|
2041f2a09d
|
fixes hound
|
2016-10-03 10:15:46 +02:00 |
|
Mojca Lorber
|
053cd8ed84
|
removes handler
|
2016-10-03 10:12:13 +02:00 |
|
Mojca Lorber
|
5b32be2137
|
adding subtitle in modal
|
2016-10-03 09:28:58 +02:00 |
|
zmagod
|
b9bc2f17c8
|
fixing hound
|
2016-10-03 08:27:13 +02:00 |
|
zmagod
|
2ee02ec472
|
mark all seen notifications
|
2016-10-03 08:20:23 +02:00 |
|
Oleksii Kriuchykhin
|
f5cc2fe225
|
Code style fixes
|
2016-09-30 09:34:58 +02:00 |
|
Luka Murn
|
f70829d1a9
|
Merge pull request #179 from okriuchykhin/ok_SCI-380
Fixes ordering of checklist items in search results [SCI-380]
|
2016-09-30 08:28:07 +02:00 |
|
Luka Murn
|
49c5474219
|
Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2
Fixed wrong CSS formatting and added release notes link to help link.
|
2016-09-30 08:27:57 +02:00 |
|
Luka Murn
|
e32e0a232c
|
Merge pull request #177 from okriuchykhin/ok_SCI-480
Fixes issue with scrollbar on sidebar [SCI-480]
|
2016-09-30 08:25:54 +02:00 |
|
Luka Murn
|
12c9f9a42f
|
Merge pull request #175 from okriuchykhin/ok_SCI-423
Fix issue with spinner in avatar upload [SCI-423]
|
2016-09-30 08:25:15 +02:00 |
|
Luka Murn
|
380d0740f8
|
Merge pull request #174 from okriuchykhin/ok_SCI-477
Fix issue with words break in task description and comments [SCI-477]
|
2016-09-30 08:25:04 +02:00 |
|
Luka Murn
|
c83342d9f0
|
Merge pull request #173 from okriuchykhin/ok_SCI-484
Fix issue with duplicate error messages in experiments modal [SCI-484]
|
2016-09-30 08:24:51 +02:00 |
|
Luka Murn
|
b1d25cb18f
|
Merge pull request #172 from ZmagoD/zd_SCI_465
Generate new experiment img after task restored [fixes SCI-465]
|
2016-09-30 08:24:31 +02:00 |
|
Oleksii Kriuchykhin
|
036bda3afa
|
Initial code for system notifications [SCI-444]
|
2016-09-29 16:51:27 +02:00 |
|
Mojca Lorber
|
35477b1005
|
Remove Info tab and change comment title on results view
|
2016-09-29 16:43:19 +02:00 |
|
zmagod
|
60a503f115
|
added assignment image
|
2016-09-29 16:05:43 +02:00 |
|
zmagod
|
e1a1b93d44
|
fixed migrations
|
2016-09-29 14:49:58 +02:00 |
|
Mojca Lorber
|
c9fbf845f1
|
Remove Info tab and change comment title
|
2016-09-29 14:37:29 +02:00 |
|
Matej Zrimšek
|
a6324d61c5
|
Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.
|
2016-09-29 14:27:26 +02:00 |
|
Mojca Lorber
|
5d905f0094
|
refactoring
|
2016-09-29 14:18:04 +02:00 |
|
Luka Murn
|
f1b74f1906
|
Fix image names in introductory popup
This will make sure browsers don't display old, cached images to clients.
|
2016-09-29 13:44:38 +02:00 |
|
Mojca Lorber
|
f4345f3aef
|
fixes hound
|
2016-09-28 16:09:39 +02:00 |
|
zmagod
|
cab1e9b521
|
start implement toolbar view
|
2016-09-28 16:03:52 +02:00 |
|
Mojca Lorber
|
efa7a1d7b5
|
add sample information in pop-up
|
2016-09-28 15:46:41 +02:00 |
|
zmagod
|
2a86aaf7e4
|
changed popout content [fixes SCI-520]
|
2016-09-28 15:12:30 +02:00 |
|
zmagod
|
485497334d
|
generated notification related migrations and model tests
|
2016-09-28 14:18:52 +02:00 |
|
zmagod
|
dad0d3868b
|
fixing hound
|
2016-09-27 17:31:37 +02:00 |
|
zmagod
|
402a77526a
|
cleaned console.log
|
2016-09-27 16:22:09 +02:00 |
|
zmagod
|
2235778110
|
fixed project and task comments + fixed date issue
|
2016-09-27 16:19:31 +02:00 |
|
Oleksii Kriuchykhin
|
366a49f3a1
|
Fixes ordering of checklist items in search results [SCI-380]
|
2016-09-27 13:00:51 +02:00 |
|
zmagod
|
0d322eba13
|
fixed hound
|
2016-09-27 11:03:10 +02:00 |
|
zmagod
|
4903cb970c
|
removed comments helper
|
2016-09-27 10:47:18 +02:00 |
|
Oleksii Kriuchykhin
|
f9e5d204bb
|
Fixes issue with scrollbar on sidebar [SCI-480]
|
2016-09-27 10:43:07 +02:00 |
|
zmagod
|
1eb9f772f4
|
refactor sciNote comments js and unified all comments behavior [fixes SCI-474]
|
2016-09-27 10:30:48 +02:00 |
|
zmagod
|
1cdfde827f
|
fixes protocol and results comments
|
2016-09-27 09:26:25 +02:00 |
|
zmagod
|
980ff63104
|
fixed task comments
|
2016-09-27 09:18:46 +02:00 |
|
Oleksii Kriuchykhin
|
792f949a61
|
Fix issue with spinner in avatar upload [SCI-423]
|
2016-09-27 09:12:31 +02:00 |
|
zmagod
|
02bfa1949e
|
fixed project comments
|
2016-09-27 09:00:02 +02:00 |
|
Oleksii Kriuchykhin
|
908ee05a23
|
Fix issue with words break in task description and comments [SCI-477]
|
2016-09-26 16:03:22 +02:00 |
|
Oleksii Kriuchykhin
|
8a3a9451e9
|
Fix issue with duplicate error messages in experiments modal [SCI-484]
|
2016-09-26 12:58:22 +02:00 |
|
zmagod
|
30a8f52216
|
generate new experiment img after task restored [fixes SCI-465]
|
2016-09-26 09:48:49 +02:00 |
|
Mojca Lorber
|
cc5cdf2577
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321
|
2016-09-26 09:39:05 +02:00 |
|
Oleksii Kriuchykhin
|
db1e24202a
|
Minor code cleanup [fixes SCI-463]
|
2016-09-26 09:08:38 +02:00 |
|
Mojca Lorber
|
c2b742374f
|
adding popup sample info
|
2016-09-23 17:45:02 +02:00 |
|
mz3944
|
1c1a7c231e
|
Merge pull request #169 from mz3944/mz_help_button_SCI_13
Added help dropdown. [SCI-13]
|
2016-09-23 13:04:38 +02:00 |
|
okriuchykhin
|
4f0fb7074b
|
Merge pull request #167 from okriuchykhin/ok_SCI-470
Fix issue with long tags in dropdown list [fixes SCI-470]
|
2016-09-23 13:00:06 +02:00 |
|