scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
6126 commits 77 branches 180 tags 167 MiB
Commit graph

6126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zmago Devetak
82a12f0fce Merge pull request #262 from ZmagoD/zd_add_notification_types_to_constants 
Enables notifications to be extended
 2016-11-08 13:08:15 +01:00
Luka Murn
d44a757b25 Add textareas to checklist name & items 
Closes SCI-644
 2016-11-08 11:50:29 +01:00
zmagod
330afe80dc fixes notification model 2016-11-08 11:46:09 +01:00
mlorb
0793fb9f11 Merge pull request #260 from mlorb/ml_sci_614 
Add notification for removing user from team and removing user from project [SCI-614]
 2016-11-08 11:30:49 +01:00
Luka Murn
55d8fea359 Make all comment edit fields textareas 2016-11-08 11:29:55 +01:00
zmagod
808ec807c2 added extends file 2016-11-08 11:26:55 +01:00
Mojca Lorber
6f1c9ffb81 refactoring 2016-11-08 11:20:14 +01:00
Luka Murn
9438ba7e10 Fix a bug 2016-11-08 09:00:00 +01:00
Luka Murn
9260ed31f3 Add Deface hooks to main navbar 2016-11-07 16:57:18 +01:00
Mojca Lorber
63eb4eeaf8 fix hound 2016-11-07 15:33:21 +01:00
Mojca Lorber
27c83992b4 refactoring notification method 2016-11-07 15:31:06 +01:00
okriuchykhin
fd805f4072 Merge pull request #259 from okriuchykhin/ok_SCI_605 
Added additional activities [SCI-605]
 2016-11-07 10:01:16 +01:00
Luka Murn
ce7733e9e9 Also add notification when UserOrganization is created 2016-11-07 09:47:30 +01:00
Luka Murn
0ab62576a2 Add new modal to organization page, remove old modal code 2016-11-07 09:43:10 +01:00
Luka Murn
a188984ede Allow strings of modal to be replaced 2016-11-07 09:43:10 +01:00
Luka Murn
6fe0d6b3df A working invite modal! 2016-11-07 09:43:10 +01:00
Luka Murn
ccf8932611 Add first version of invite users modal 2016-11-07 09:43:09 +01:00
Oleksii Kriuchykhin
fe6724431e Futher improvement of samples assign/unassign logging [SCI-605] 2016-11-07 09:29:56 +01:00
mz3944
12d1c31651 Merge pull request #268 from mz3944/mz_add_profile_statistics_data_hook_SCI_567 
Added profile statistics data hook.
 2016-11-04 17:39:26 +01:00
Oleksii Kriuchykhin
a1bfacef86 Improved samples assign/unassign logging [SCI-605] 2016-11-03 17:59:32 +01:00
Matej Zrimšek
0fe5822825 Added profile statistics data hook. 2016-11-03 17:50:32 +01:00
mlorb
4c311c1664 Merge pull request #266 from mlorb/ml_avatar_marge_conflict 
fix merge conflict problem with avatar on profile page
 2016-11-03 16:18:24 +01:00
Mojca Lorber
a234c4c9d9 fix merge conflict problem with avatar on profile page 2016-11-03 15:23:09 +01:00
zmagod
1d6b93829c added hooks in notifications preview 2016-11-03 14:48:01 +01:00
Oleksii Kriuchykhin
3d25da5db7 Fixed bug with protocol loading from file [SCI-605] 2016-11-03 14:15:22 +01:00
zmagod
3c9bd6f511 enables notification to be extended 2016-11-02 14:44:16 +01:00
Mojca Lorber
dec08c47cf Merge branch 'mlorb-ml_sci_610' 2016-11-02 14:08:05 +01:00
Mojca Lorber
44b51d087a merging 2016-11-02 14:06:20 +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
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
Mojca Lorber
91ec201fd0 make image clickable 2016-10-27 16:18:31 +02:00
Oleksii Kriuchykhin
d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +02:00
Mojca Lorber
888aa31aed fix hound 2016-10-27 11:18:11 +02:00
Mojca Lorber
5719d4c61f show edit avatar on mouse hover, add background and center image 2016-10-27 11:09:30 +02:00
Mojca Lorber
8309df0aaf fix hound 2016-10-26 13:51:05 +02:00
Mojca Lorber
878952f072 change edit avatar in profile 2016-10-26 13:41:17 +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