scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-23 08:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
11406 commits 70 branches 179 tags 165 MiB
Commit graph

11406 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jure Grabnar f727289935 Add lock check for editing result 2016-10-03 13:43:35 +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
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 a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +02:00
Jure Grabnar a6ebff06a7 Add error message to wopi discovery 
Fix ambigious open call
 2016-09-30 10:39:14 +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
Jure Grabnar ff47f29dc2 Add wopi file activity 
SCI-393 #close
 2016-09-29 16:16:42 +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
Jure Grabnar ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +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
Jure Grabnar 3bc683be8f Fix access_token_ttl calculation 2016-09-29 10:57:08 +02:00
zmagod d95ddeaf6a changed image 2016-09-29 09:15:41 +02:00
Jure Grabnar bc22697ebe Take/release space in putfile 2016-09-28 18:02:47 +02:00
Jure Grabnar 5e5f4c5ed4 Add text extraction on unlock 2016-09-28 17:36:53 +02:00
Jure Grabnar 02ddd64aaa Set last_modified_by on put_file 2016-09-28 17:00:19 +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
Jure Grabnar 1bdbc00e8c Update Gemfile.lock 2016-09-28 11:56:19 +02:00
Jure Grabnar e96e8486ea Add check file permissions to assets controller 
SCI-502 #close
 2016-09-28 09:33:44 +02:00
Jure Grabnar 25c9ec67b3 Check permissions in wopi_controller 2016-09-28 09:33:44 +02:00