scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-09 00:13:49 +08:00
Code Issues Projects Releases Packages Wiki Activity
2655 commits 43 branches 185 tags 169 MiB
Commit graph

282 commits

Author SHA1 Message Date
Mojca Lorber
39dd6daabb small fixes 2017-06-19 15:30:38 +02:00
Mojca Lorber
107aa76e55 fix bug with audit trail - ajax error 2017-06-14 14:48:22 +02:00
okriuchykhin
97a94ff4a3 Merge pull request #679 from okriuchykhin/ok_SCI_1345 
Fix repository view permissions for team guests [SCI-1345]
 2017-06-13 15:47:44 +02:00
mlorb
074a47aae1 Merge pull request #675 from mlorb/ml_sci_1272 
Fix permissions [SCI-1272]
 2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin
2d693a3fb7 Fix repository view permissions for team guests [SCI-1345] 2017-06-13 10:33:08 +02:00
Luka Murn
2e2f07bf58 Merge pull request #668 from Ducz0r/lm-sci-1335 
Fix sidebar for repositories [SCI-1335]
 2017-06-13 09:37:33 +02:00
Luka Murn
c3d289291f Fix case statement 
Closes SCI-1335.
 2017-06-13 09:09:07 +02:00
Zmago Devetak
6cdf37041f Merge pull request #663 from ZmagoD/zd_SCI_1328 
fixes bug with smart annotations in reports [fixes SCI-1328]
 2017-06-13 08:57:09 +02:00
zmagod
a865253a2e first run 2017-06-13 08:10:10 +02:00
Mojca Lorber
9108102b42 fix permissions 2017-06-12 17:34:36 +02:00
Luka Murn
e26337d5ee Merge pull request #671 from biosistemika/custom-repositories 
Merge custom-repositories into master
 2017-06-09 18:46:47 +02:00
Luka Murn
481a48c953 Hound is love, Hound is life 2017-06-09 12:51:33 +02:00
Luka Murn
cfb734704e Fix sidebar for repositories 
Closes SCI-1335.
 2017-06-09 12:49:23 +02:00
zmagod
e45c2ce560 fixes bug with smart annotations in reports [fixes SCI-1328] 2017-06-08 13:41:27 +02:00
Luka Murn
2ab31aba2f Merge pull request #660 from Ducz0r/lm-sci-1270 
Copy repository functionality [SCI-1270]
 2017-06-08 11:45:57 +02:00
Luka Murn
38361e4bb4 Setup initial GUI 2017-06-07 18:43:48 +02:00
Luka Murn
02dd6636ba Allow saving & editing of reports with repository elements 
Closes SCI-1279.
 2017-06-07 16:55:00 +02:00
Oleksii Kriuchykhin
8b1190060e Add custom repository table [SCI-1274] 2017-06-07 15:23:25 +02:00
Mojca Lorber
51c4eeb106 renaming 2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f fix hound 2017-06-06 13:33:57 +02:00
Mojca Lorber
da98788031 small code fixes 2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229 create new repository 2017-06-06 09:54:39 +02:00
Luka Murn
62d97f6e64 Merge pull request #655 from Ducz0r/lm-sci-1321 
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
 2017-06-06 07:59:24 +02:00
Luka Murn
f298ec54e7 Code beautification per @zmagod's request 
Closes SCI-1321.
 2017-06-06 07:58:46 +02:00
Luka Murn
8c7aebbb88 Fix bug with TinyMCE not working for steps with nil description 
Closes SCI-1321.
 2017-06-05 17:43:03 +02:00
Matej Zrimšek
419d638163 Renamed reposiotry edit and destroy permission helper. [fix 1269] 2017-06-05 17:36:26 +02:00
Mojca Lorber
27d3a5097b fix hound 2017-06-05 16:07:21 +02:00
Matej Zrimšek
5c9a453439 Added permissions for deleting and renaming of repositories. [SCI-1269] 2017-06-02 17:50:34 +02:00
Mojca Lorber
7c2b657b0e fix bug with special characters when truncating activities titles 2017-06-01 15:10:26 +02:00
Mojca Lorber
d88b21fb5e truncate all titles in activities 2017-06-01 15:09:01 +02:00
Luka Murn
fcc3995049 Merge pull request #647 from biosistemika/master 
Bring latest master changes into custom-repositories
 2017-05-30 14:18:14 +02:00
Matej Zrimšek
19ffd77d32 Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305] 2017-05-26 18:14:15 +02:00
Oleksii Kriuchykhin
157b1630b9 Add missing include for sinitize_input [SCI-1309] 2017-05-25 16:28:06 +02:00
mlorb
58ac457d38 fix merge bug 2017-05-23 11:32:02 +02:00
mlorb
872f712be8 Merge branch 'custom-repositories' into ml_sci_1266_v2 2017-05-23 11:05:25 +02:00
Mojca Lorber
9ae615264d add global repositories screen - tab control 2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin
e99e3edb7b Add repositories dropdown to task navigation [SCI-1273] 2017-05-18 14:21:00 +02:00
Oleksii Kriuchykhin
ad39d09a53 Disable turbolinks on search links to fix JS errors [SCI-452] 2017-05-12 13:23:29 +02:00
Zmago Devetak
9911c0d148 Merge pull request #613 from ZmagoD/zd_SCI_1241_v3 
replace all ActionController::Base.helpers.sanitize calls with custom…
 2017-05-11 14:30:26 +02:00
zmagod
80a0af8c9f replace all ActionController::Base.helpers.sanitize calls with custom sanitize_input method [fixes SCI-1241] 2017-05-11 11:36:47 +02:00
okriuchykhin
f239238064 Merge pull request #611 from okriuchykhin/ok_SCI_1252 
Fix root_url method unavailable in application_helper [SCI-1252]
 2017-05-11 11:15:00 +02:00
Oleksii Kriuchykhin
229693ec61 Fix root_url method unavailable in application_helper [SCI-1252] 2017-05-10 18:15:08 +02:00
zmagod
511f39e093 add constants 2017-05-10 15:33:33 +02:00
zmagod
10db322307 fixes input sanitize method [fixes SCI-1248] 2017-05-10 14:57:11 +02:00
Zmago Devetak
13570ba5cb Merge pull request #602 from ZmagoD/zd_SCI_1247 
fixes pdf export and image size [fixes SCI-1247]
 2017-05-10 09:31:55 +02:00
Zmago Devetak
cd503580b2 Merge pull request #599 from ZmagoD/zd_SCI_1241 
fix samples bug [SCI-1241]
 2017-05-09 15:55:43 +02:00
Mojca Lorber
7ca62a16bb fix hound 2017-05-09 14:55:23 +02:00
Mojca Lorber
e1475fbfef fix bug with avatar in system log 2017-05-09 14:40:02 +02:00
zmagod
2d69896897 fixes pdf export and image size [fixes SCI-1247] 2017-05-09 13:59:59 +02:00
zmagod
df13478186 fix samples bug [SCI-1241] 2017-05-09 11:25:00 +02:00
Zmago Devetak
4b816f5322 Merge pull request #568 from ZmagoD/zd_SCI_1119 
Add images to fields with rich text formatting
 2017-05-08 13:06:58 +02:00
zmagod
d6f303581f refactor 2017-05-08 12:56:33 +02:00
Zmago Devetak
e47bf8f013 Merge pull request #582 from ZmagoD/zd_SCI_1051 
fix reports pdf for user annotation [SCI-1051]
 2017-05-08 10:24:40 +02:00
zmagod
b22350136f adds label to step in report [fixes SCI-488] 2017-05-05 09:45:18 +02:00
zmagod
289a148332 refactor 2017-05-03 15:33:23 +02:00
zmagod
5b58824ec0 refactor 2017-05-03 15:30:08 +02:00
zmagod
1b618e88e5 fix reports pdf for user annotation [SCI-1051] 2017-05-03 10:50:43 +02:00
osboxes.org
21a39fc704 Code indentation corrected [fixes SCI-1214] 2017-04-28 10:31:14 +01:00
osboxes.org
f72802f9f2 Tab Teams is highlighted when in Audit trails [fixes SCI-1214] 2017-04-26 16:31:44 +01:00
zmagod
1fefeee3d1 adds team space related methods 2017-04-25 13:44:31 +02:00
zmagod
66f43803c0 refactor, fix user annotation bug 2017-04-24 16:22:25 +02:00
zmagod
55c8c498e2 add image upload functionality to result text 2017-04-24 12:28:27 +02:00
zmagod
550f563666 working version for steps first run 2017-04-21 16:09:04 +02:00
zmagod
c25df63a14 add tinymce img importer and refactor input sanitize helper 2017-04-19 09:11:52 +02:00
okriuchykhin
0fe84c4e24 Merge pull request #550 from okriuchykhin/ok_SCI_1157 
Improve speed of search [SCI-1157]
 2017-04-12 13:11:26 +02:00
Oleksii Kriuchykhin
07d658ab82 Improve speed of search [SCI-1157] 2017-04-11 14:55:44 +02:00
Zmago Devetak
91793c295a Merge pull request #542 from ZmagoD/zd_SCI_825 
Smart annotations and Notifications
 2017-04-10 15:10:17 +02:00
zmagod
90faeec410 fixes typos and protocol step links 2017-04-10 11:21:28 +02:00
zmagod
9bb1bb3f9b refactor [fixes SCI-825] 2017-04-06 15:08:03 +02:00
zmagod
d331911ffe completed step annotations 2017-04-06 08:42:16 +02:00
Mojca Lorber
a0fe47a05d change helper method for user info popover 2017-04-04 15:22:41 +02:00
zmagod
99c116f257 first run 2017-04-04 09:19:43 +02:00
Oleksii Kriuchykhin
2faa137f67 Add user popover method for users [SCI-1127] 2017-04-03 15:10:00 +02:00
zmagod
239a44c26b change send to public_send 2017-03-24 16:25:50 +01:00
zmagod
4635a3320d Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-24 16:09:28 +01:00
zmagod
5cc6cd094e refactor 2017-03-17 16:47:58 +01:00
zmagod
95a0f596b7 adds file link 2017-03-17 16:40:57 +01:00
zmagod
856a4611c6 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1003_add_extends 2017-03-14 15:58:08 +01:00
zmagod
b821fff4a5 adds non breaking space between file name and buttons 2017-03-13 14:14:44 +01:00
zmagod
7b16e5643e fix assets preprocesor for wopi files 2017-03-13 13:20:49 +01:00
zmagod
0c2523beca Merge branch 'master' of https://github.com/biosistemika/scinote-web into office_integration 2017-03-10 16:21:43 +01:00
mlorb
39e1ac4b26 Merge pull request #512 from biosistemika/ml_sci_1074 
Fix permissions for experiment actions [SCI-1074]
 2017-03-10 11:44:27 +01:00
Mojca Lorber
1ba5f1748f fix permissions for experiment actions 2017-03-09 17:45:34 +01:00
zmagod
1d42d46c02 fixes bug with step comments 2017-03-09 16:02:52 +01:00
zmagod
9939d8df06 refactor 2017-03-09 10:51:54 +01:00
zmagod
f78ef8c82a fixes hound 2017-03-08 14:41:42 +01:00
zmagod
5c2e9a4b04 adds extends and fixes report methods 2017-03-08 14:14:03 +01:00
Oleksii Kriuchykhin
0f8336e5a5 Refactoring of the comments using STI [SCI-1090] 2017-03-08 13:18:20 +01:00
Mojca Lorber
f84611f558 fix report - checklist items are in separate row than checkboxes 2017-02-22 15:51:26 +01:00
okriuchykhin
8e18ff44a6 Merge pull request #479 from okriuchykhin/ok_SCI_999 
Add task complete/uncomplete functionality [SCI-999]
 2017-02-20 15:19:00 +01:00
Oleksii Kriuchykhin
218e96b1f0 Code style fixes [SCI-999] 2017-02-16 11:45:07 +01:00
Luka Murn
164bd787e9 Merge pull request #481 from Ducz0r/lm-sci-958-fix 
Team administrators are Viewers of all Projects in Team [SCI-958]
 2017-02-15 10:40:52 +01:00
Nbernot
97584aabb3 Updated the lists of office online file extensions 
Extended the list of file extensions that receive office online icons and 'open in' text.
 2017-02-14 16:44:03 +01:00
Luka Murn
c6ed73bc82 Allow team admins to see all projects, even hidden ones 2017-02-13 13:42:53 +01:00
Oleksii Kriuchykhin
cf8566df33 Add task complete/uncomplete functionality [SCI-999] 2017-02-10 14:27:20 +01:00
Luka Murn
f7bd62547e Refactor teams settings into its own controllers 2017-02-09 14:37:59 +01:00
Luka Murn
7bee3a4ea0 Move user profile to settings 2017-02-09 11:34:52 +01:00
Mojca Lorber
d3e0eca44e redesign individual team page 2017-02-01 14:44:47 +01:00
zmagod
e59b2e039a Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_939 2017-01-27 11:15:31 +01:00
Luka Murn
3bf447b0f4 Fix bug where reCaptcha form wasn't working 2017-01-26 16:06:29 +01:00