scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 14:46:00 +08:00
Code Issues Projects Releases Packages Wiki Activity
797 commits 31 branches 181 tags 167 MiB
Commit graph

797 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Zmago Devetak
1aa09a2ce2 Merge pull request #187 from ZmagoD/zd_SCI_440 
add notifications generators
 2016-10-03 16:15:20 +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
Luka Murn
71458a890b Merge pull request #185 from okriuchykhin/global-notifications-SCI-444 
Initial code for system notifications [SCI-444]
 2016-10-03 16:05:25 +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
Zmago Devetak
7807bd37cd Merge pull request #183 from ZmagoD/zd_SCI_441 
Start working on SCI-441
 2016-09-29 16:22:08 +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
c88ae84001 Merge pull request #182 from Ducz0r/lm-fix-introductory-popup 
Fix image names in introductory popup
 2016-09-29 13:46:17 +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
Luka Murn
f994469cb5 Bump version to 1.3 2016-09-29 13:04:28 +02:00
Zmago Devetak
d67302803a Merge pull request #180 from ZmagoD/zd_SCI_520 
Changed popout content [fixes SCI-520]
 2016-09-29 10:58:57 +02:00
zmagod
d95ddeaf6a changed image 2016-09-29 09:15:41 +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