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
905 commits 70 branches 179 tags 165 MiB
Commit graph

905 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matej Zrimšek 0d133ff32e Refactoring and added back buttons for tutorial steps 1-5. 2016-11-17 14:46:04 +01:00
okriuchykhin 39d3b65c52 Merge pull request #297 from okriuchykhin/ok_SCI_685 
Improved tutorial styling [SCI-685]
 2016-11-17 10:57:10 +01:00
Oleksii Kriuchykhin d2e29935cf Improved tutorial styling [SCI-685] 2016-11-16 15:44:06 +01:00
okriuchykhin f4a059d01a Merge pull request #295 from okriuchykhin/ok_SCI_677 
Fix tutorial strings [SCI-677]
 2016-11-16 14:33:45 +01:00
Oleksii Kriuchykhin fc09cafe63 Fix tutorial strings [SCI-677] 2016-11-16 13:15:02 +01:00
okriuchykhin 43b85ac5c2 Merge pull request #293 from okriuchykhin/ok_SCI_670 
Fix project canvas interactivity in the tutorial [SCI-670]
 2016-11-16 11:32:13 +01:00
Luka Murn 4b8824ca16 Merge pull request #291 from Ducz0r/lm-sci-676-fix 
Allow inviting of unconfirmed user onto multiple teams [SCI-676]
 2016-11-16 11:32:01 +01:00
Luka Murn f4c9863814 Merge pull request #292 from Ducz0r/lm-sci-664-fix-2 
Reload whole page after user is invited from team invite users modal [SCI-664]
 2016-11-15 17:15:53 +01:00
Oleksii Kriuchykhin 410837e6cf Fix project canvas interactivity in the tutorial [SCI-670] 2016-11-15 16:53:20 +01:00
Luka Murn 263244ad83 Reload whole page after user is invited from team invite users modal 
Closes SCI-664.
 2016-11-15 16:21:32 +01:00
Luka Murn eb4d031b79 Fix destroying of users in relation to notifications 2016-11-15 15:56:32 +01:00
Luka Murn 04749c3b2c Allow inviting of existing, unconfirmed users 
Closes SCI-676.
 2016-11-15 15:04:31 +01:00
okriuchykhin 01b01939f3 Merge pull request #277 from okriuchykhin/ok_SCI_571 
Additional steps added to tutorial and numbering of the steps fixed [SCI-571]
 2016-11-15 12:05:20 +01:00
Luka Murn 7c03037643 Merge pull request #286 from Ducz0r/lm-sci-655-fix 
Save first time tutorial Activity-s without callbacks [SCI-655]
 2016-11-15 12:00:35 +01:00
mlorb 69df418d0c Merge pull request #289 from mlorb/ml_sci_656_vol2 
Profile changes for gamification [SCI-656] vol2
 2016-11-15 11:27:53 +01:00
Mojca Lorber 607f1381d0 fix mobile view 2016-11-15 10:58:15 +01:00
mlorb d3ee7f546c Merge pull request #285 from mlorb/ml_sci_656 
Profile changes for gamification [SCI-656]
 2016-11-14 16:36:14 +01:00
Luka Murn fa6d8d3020 Save first time tutorial Activity-s without callbacks 
This PR adds a new, pretty useful little gem called sneaky-save.
Closes SCI-655
 2016-11-14 15:55:44 +01:00
Mojca Lorber 7002fc3f2f fix hound 2016-11-14 15:10:37 +01:00
Mojca Lorber 615cd3c278 profile changes for gamification 2016-11-14 15:04:18 +01:00
Oleksii Kriuchykhin b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00
Oleksii Kriuchykhin d2491a18a4 Tutorial Save Protocol step added [SCI-571] 2016-11-11 10:06:18 +01:00
okriuchykhin ac0a449522 Merge pull request #271 from okriuchykhin/ok_SCI_570_v2 
Added step numbers in intro tutorial [SCI-570]
 2016-11-11 09:08:47 +01:00
Luka Murn 0e065026bd Closes SCI-648 2016-11-10 16:18:17 +01:00
Luka Murn 564274a588 Set invited_by field to invited users 2016-11-10 14:45:24 +01:00
Oleksii Kriuchykhin 6811120829 Added step numbers in intro tutorial [SCI-570] 2016-11-09 10:52:00 +01:00
Luka Murn c88f834ba9 Merge pull request #269 from Ducz0r/lm-sci-569 
Add a refactored invite users modal that can be reused throughout application
 2016-11-08 16:57:05 +01:00
Luka Murn b246853117 Code styling (use link_to, %w) 2016-11-08 16:43:25 +01:00
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
zmagod 330afe80dc fixes notification model 2016-11-08 11:46:09 +01:00
zmagod 808ec807c2 added extends file 2016-11-08 11:26:55 +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
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
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
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
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
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