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

171 commits

Author SHA1 Message Date
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
zmagod 808ec807c2 added extends file 2016-11-08 11:26:55 +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 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
zmagod 3c9bd6f511 enables notification to be extended 2016-11-02 14:44:16 +01:00
Mojca Lorber 44b51d087a merging 2016-11-02 14:06:20 +01:00
Oleksii Kriuchykhin d28edfb488 Added statistics block in users profile [SCI-566] 2016-10-27 13:44:27 +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 4b388493b0 Fix a String 
Closes SCI-611
 2016-10-25 09:36:22 +02:00
zmagod 578ce86fed removes projects dropdown description from tutorial step [fixes SCI-589] 2016-10-20 13:29:16 +02:00
zmagod 1614cbc2b2 fixes repeat tutorial button and localization typos 2016-10-17 15:16:22 +02:00
zmagod d7f514db09 fixes search 2016-10-17 15:10:26 +02:00
zmagod efe031d766 setup current_organization in all controllers 2016-10-17 15:10:26 +02:00
zmagod d86a4dd311 setup global team switch view and controller action 2016-10-17 15:10:26 +02:00
Matej Zrimšek 1b0fb255db Replaced hardcoded big values with infinity constant in fixtures. 2016-10-17 13:52:33 +02:00
Matej Zrimšek a31753ea39 Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems. 2016-10-17 11:57:47 +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 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
Matej Zrimšek 21ec05d541 Refactored searches (user and globals earch) and used constants. 2016-10-17 11:17:59 +02:00
Luka Murn 845d487fa1 Merge pull request #218 from Ducz0r/lm-mail-previews 
Add notification mailer preview
 2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin c6fb57318f Added use of constants in JS [SCI-530] 2016-10-13 13:06:11 +02:00
Luka Murn bdaeb4db13 Add notification mailer preview 2016-10-13 08:56:04 +02:00
mlorb 78f7879c04 Merge pull request #216 from mlorb/ml_sci_555 
Adding update notifications in settings [SCI-555]
 2016-10-13 08:53:55 +02:00
Mojca Lorber 42f6b679f8 Adding system notifications email function in settings 2016-10-12 11:50:26 +02:00
Luka Murn cccabcdd7b Remove invitation_to_organization email 
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
 2016-10-12 10:54:36 +02:00
Zmago Devetak f25767fdc3 Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup 
Removed introductory popup [fixes SCI-534]
 2016-10-12 08:13:46 +02:00
Oleksii Kriuchykhin 90c853743c Additional fixes to email markup and logic [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
zmagod 42a30576e3 removed introductory popup [fixes SCI-534] 2016-10-11 08:33:50 +02:00
Luka Murn 448daab7c8 Merge pull request #207 from biosistemika/add-deface-hotfix 
Merge hotfix 1.3.1 into master
 2016-10-07 18:26:13 +02:00
Luka Murn 860c3f9bf1 Bump version to 1.3.1 2016-10-07 15:57:01 +02:00
zmagod de00a19dd9 fixes styling in settings preferences [SCI-553] 2016-10-06 13:22:44 +02:00
Luka Murn 5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
Oleksii Kriuchykhin 4e2ad1d5e6 Fix the issues after code review [SCI-442] 2016-10-05 15:54:31 +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
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
mlorb 153b692c0c Merge pull request #181 from mlorb/ml_sci_321 
Displaying more information for individual samples in Sample table [SCI-321]
 2016-10-03 16:37:35 +02:00
Mojca Lorber 3b0185a45b change title of modal 2016-10-03 16:33:58 +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
Mojca Lorber 5b32be2137 adding subtitle in modal 2016-10-03 09:28:58 +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
zmagod e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00