scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-26 06:54:48 +08:00
Code Issues Projects Releases Packages Wiki Activity
2202 commits 90 branches 195 tags 173 MiB
Commit graph

360 commits

Author SHA1 Message Date
zmagod
3c9bd6f511 enables notification to be extended 2016-11-02 14:44:16 +01:00
Mojca Lorber
749b108928 fix hound 2016-11-02 13:32:15 +01:00
Mojca Lorber
a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Oleksii Kriuchykhin
e8d20dfc01 Added additional activities [SCI-605] 2016-11-02 10:43:36 +01:00
Oleksii Kriuchykhin
d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
zmagod
e02132578a first run 2016-10-24 20:07:20 +02:00
Matej Zrimšek
f2cd9890dd Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
a6a2a237aa Removed unneeded ERB tags, which caused error. Minor refactoring. 2016-10-17 11:57:47 +02:00
Matej Zrimšek
5966911b92 Fixed Hound alerts. 2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416 Ruby constants are now automatically available in JS. Refactoring was needed. 2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558 Added remaining constants. 2016-10-17 11:30:05 +02:00
Mojca Lorber
42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Oleksii Kriuchykhin
90c853743c Additional fixes to email markup and logic [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
3f219e1bfe Hound code style fixes [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
5399033fce Added user settings for email notifications [SCI-443] 2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
8dc956010c Initial code commit [SCI-443] 2016-10-11 16:43:17 +02:00
Jure Grabnar
1f67aec258 Prevent destroying protocols when file is edited 
SCI-552 #close
 2016-10-06 16:13:42 +02:00
Luka Murn
56d2240de5 Optimize data query in user_notification.rb 2016-10-05 16:21:13 +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
71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529 
Prepare settings screen for notifications
 2016-10-05 14:54:47 +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
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
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
Zmago Devetak
91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474 
Unify the comments
 2016-10-03 15:26:17 +02:00
zmagod
ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
zmagod
2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Jure Grabnar
1e14955ade Prevent deleting asset on step update 2016-10-01 18:47:05 +02:00
Jure Grabnar
d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Jure Grabnar
5c9e995e56 Don't delete asset on locked 2016-10-01 13:23:04 +02:00
Jure Grabnar
a6ebff06a7 Add error message to wopi discovery 
Fix ambigious open call
 2016-09-30 10:39:14 +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
Jure Grabnar
ff47f29dc2 Add wopi file activity 
SCI-393 #close
 2016-09-29 16:16:42 +02:00
zmagod
e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Jure Grabnar
ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +02:00
Jure Grabnar
3bc683be8f Fix access_token_ttl calculation 2016-09-29 10:57:08 +02:00
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
zmagod
485497334d generated notification related migrations and model tests 2016-09-28 14:18:52 +02:00
Jure Grabnar
5aea0fbb19 Refactor the rest of WOPI logic from Nejc 2016-09-28 09:33:44 +02:00
Jure Grabnar
b51f2a3027 Add basic WOPI proof checking 
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
 2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec First working version of office integration 
Only works on scinote-preview
 2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +02:00
Oleksii Kriuchykhin
366a49f3a1 Fixes ordering of checklist items in search results [SCI-380] 2016-09-27 13:00:51 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
zmagod
30a8f52216 generate new experiment img after task restored [fixes SCI-465] 2016-09-26 09:48:49 +02:00
okriuchykhin
a7f3f793c8 Merge pull request #161 from okriuchykhin/ok_SCI-380 
Fixes issue with reordering of checklist items [fixes SCI-380]
 2016-09-23 10:37:56 +02:00
mz3944
cde7f3805f Merge pull request #165 from mz3944/mz_replace_hardcoded_values_with_constants_v2 
Added missing validation for protocol description.
 2016-09-22 17:36:18 +02:00