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

855 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mojca Lorber a2213e23b3 add notification for removing user from team and removing user from project 2016-11-02 11:52:41 +01:00
Zmago Devetak 6e022699eb Merge pull request #256 from ZmagoD/add_getting_started_flash_hook 
Added getting started hoot to layout/application.html
 2016-10-28 16:19:20 +02:00
okriuchykhin 8821cfb5fc Merge pull request #255 from okriuchykhin/ok_SCI_566 
Added statistics block in users profile [SCI-566]
 2016-10-28 14:27:15 +02:00
Luka Murn d67d36612b Add addons folder 2016-10-28 11:02:33 +02:00
zmagod 01b27e9e6d added getting started hoot to layout/application.html 2016-10-28 10:36:15 +02:00
Oleksii Kriuchykhin d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Luka Murn 24cdbedd05 Bump version to 1.4.0 2016-10-25 18:15:53 +02:00
Luka Murn 2769784d9c Merge pull request #252 from Ducz0r/lm-sci-616-fix 
Fix confirm() bug when saving report [SCI-616]
 2016-10-25 18:14:21 +02:00
Luka Murn b4685b0a40 Remove console.log() 2016-10-25 18:13:29 +02:00
Luka Murn cd360d7279 Fix the save report alert() bug 
Closes SCI-616
 2016-10-25 18:12:29 +02:00
Luka Murn eec6b1403d Merge pull request #247 from Ducz0r/lm-hotfix-blank-current-org 
Add check in application controller to always set current org if nil
 2016-10-25 11:53:05 +02:00
Zmago Devetak 266d1415d0 Merge pull request #246 from ZmagoD/zd_SCI_599 
fixes error when removing user from team [SCI-599]
 2016-10-25 11:52:44 +02:00
Luka Murn 7885fd0f39 Add check in application controller to always set current org if nil 2016-10-25 11:39:57 +02:00
zmagod 6a328969f0 reset current_user if the user leaves the team [fixes SCI-599] 2016-10-25 09:53:02 +02:00
Luka Murn 3f84ad3ab4 Merge pull request #245 from Ducz0r/lm-sci-611-fix 
Fix a String
 2016-10-25 09:37:29 +02:00
Luka Murn 4b388493b0 Fix a String 
Closes SCI-611
 2016-10-25 09:36:22 +02:00
Zmago Devetak 2cae847411 Merge pull request #244 from ZmagoD/zd_SCI_608 
sets current organization id as a current user first organization if is the case that the current_organization is not present  [fixes SCI-608]
 2016-10-25 09:16:27 +02:00
zmagod 24b81c96f6 sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608] 2016-10-24 21:20:41 +02:00
zmagod e02132578a first run 2016-10-24 20:07:20 +02:00
Luka Murn bb903956a8 Merge pull request #240 from Ducz0r/lm-add-release-notes-url 
Add back the release notes URL to navbar
 2016-10-24 17:02:06 +02:00
Luka Murn b13fd22408 Add back the release notes URL to navbar 
Closes SCI-604
 2016-10-24 16:59:32 +02:00
Zmago Devetak 12c77df883 Merge pull request #237 from ZmagoD/zd_SCI_593_v2 
Styled global team switch and search [fixes SCI-593]
 2016-10-21 16:28:50 +02:00
zmagod 9a4603dd7d removed unneeded css 2016-10-21 16:27:53 +02:00
Luka Murn 388e092bbf Merge pull request #238 from Ducz0r/lm-sci-596-fix 
SCI-596 fix
 2016-10-21 11:59:01 +02:00
zmagod 49d3879642 fixes padding on mobile, added separator on team switch dropdown, focus search input 2016-10-21 11:46:59 +02:00
Zmago Devetak 4f5b7ad8ad Merge pull request #228 from ZmagoD/zd_SCI_585 
Removes archived projects from index page [fixes SCI-585]
 2016-10-21 11:33:01 +02:00
Luka Murn 7b825a217f Closes SCI-596 2016-10-21 11:08:47 +02:00
Zmago Devetak af0e9b99b6 Merge pull request #233 from ZmagoD/zd_SCI_591 
Move tooltip to the right [fixes SCI-591]
 2016-10-21 10:38:25 +02:00
okriuchykhin f876ade05e Merge pull request #236 from okriuchykhin/ok_SCI_557 
Fixes issue with new comments and date separator SCI-557
 2016-10-21 10:29:46 +02:00
Oleksii Kriuchykhin 5be7904f5a Fix hound warnings [SCI-557] 2016-10-21 09:37:24 +02:00
zmagod c642e208dd styled global team switch and search [fixes SCI-593] 2016-10-21 09:33:18 +02:00
zmagod db806f3c10 hide private projects 2016-10-21 09:06:19 +02:00
Zmago Devetak f615b3da41 Merge pull request #230 from ZmagoD/zd_SCI_586 
Adds new team button to team switch dropdown [fixes SCI-586]
 2016-10-21 08:29:05 +02:00
Oleksii Kriuchykhin 0c1ff06f21 Fixes issue with new comments and date separator SCI-557 2016-10-20 22:33:15 +02:00
Zmago Devetak 490baab552 Merge pull request #229 from ZmagoD/zd_SCI_589 
removes projects dropdown description from tutorial step [fixes SCI-589]
 2016-10-20 16:33:01 +02:00
Zmago Devetak 094e989af5 Merge pull request #227 from ZmagoD/zd_SCI_587 
Removes org selector form project archive [fixes SCI-587]
 2016-10-20 16:32:46 +02:00
zmagod 9214adc591 fixed team name position 2016-10-20 15:35:09 +02:00
mlorb fa4f3fb0a0 Merge pull request #220 from mlorb/ml_sci_462 
fix multiplication of edit comment fields [SCI-462]
 2016-10-20 15:14:31 +02:00
okriuchykhin 2247dc2d3c Merge pull request #232 from okriuchykhin/ok_SCI_590 
Fixes different color of buttons in notifications settings [SCI-590]
 2016-10-20 15:09:35 +02:00
zmagod f9fb4d8bd6 move tooltip to the right [fixes SCI-591] 2016-10-20 14:34:45 +02:00
Oleksii Kriuchykhin 347216183f Fixes different color of buttons in notifications settings [SCI-590] 2016-10-20 14:17:07 +02:00
zmagod f21c9e394f adds new team button to team switch dropdown [fixes SCI-586] 2016-10-20 13:47:41 +02:00
zmagod 578ce86fed removes projects dropdown description from tutorial step [fixes SCI-589] 2016-10-20 13:29:16 +02:00
zmagod 4c086a6fc1 removes archived projects from index page [fixes SCI-585] 2016-10-20 13:13:44 +02:00
zmagod 8aaf58f75f removes org selector form project archive [fixes SCI-587] 2016-10-20 12:50:55 +02:00
Luka Murn d255e12f90 Migration hotfix 2016-10-18 12:52:14 +02:00
mz3944 47707779c0 Merge pull request #221 from mz3944/mz_migration_constant_qfix 
Fixed missing namespace in constant in migration.
 2016-10-18 11:42:08 +02:00
Luka Murn 640a575a3a Merge pull request #222 from biosistemika/modular-tasks 
Merge global team switch into master
 2016-10-18 11:39:09 +02:00
Matej Zrimšek 796e7da133 Fixed missing namespace in constant in migration. 2016-10-18 11:36:33 +02:00
okriuchykhin 076353b207 Merge pull request #204 from okriuchykhin/ok_SCI-463 
Fix issue with pop-up windows and turbolinks [SCI-463]
 2016-10-18 09:12:47 +02:00