Oleksii Kriuchykhin
|
2aba0f46a6
|
Add global settings base class [SCI-1004]
|
2017-02-20 15:11:57 +01:00 |
|
Luka Murn
|
573f3c8d42
|
Merge pull request #483 from Ducz0r/lm-sci-1026-fix
Fix manage project users modal bug [SCI-1026]
|
2017-02-20 08:22:03 +01:00 |
|
Luka Murn
|
ce617894c5
|
Fix manage project users modal bug
Closes SCI-1026.
|
2017-02-16 15:29:58 +01:00 |
|
Oleksii Kriuchykhin
|
4fb5fa79af
|
Move task completion activity and notification creation to separate methods [SCI-999]
|
2017-02-16 13:36:05 +01:00 |
|
Oleksii Kriuchykhin
|
218e96b1f0
|
Code style fixes [SCI-999]
|
2017-02-16 11:45:07 +01:00 |
|
Zmago Devetak
|
c963674e49
|
Merge pull request #482 from ZmagoD/zd_SCI_987_vol2
fixes bug with user teams table [fixes SCI-987]
|
2017-02-15 13:30:25 +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 |
|
zmagod
|
836baa7412
|
fixes bug with user teams table [fixes SCI-987]
|
2017-02-15 10:06:21 +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
|
d097f0dd15
|
Merge pull request #477 from Ducz0r/lm-sci-928
Refactor, merge, unify, improve, update, beautify settings page [SCI-928]
|
2017-02-13 16:42:57 +01:00 |
|
Luka Murn
|
1b6f50647c
|
Please Hound
|
2017-02-13 16:40:27 +01:00 |
|
Luka Murn
|
b369177d1f
|
Merge pull request #480 from Ducz0r/lm-sci-964-fix
Fix system notification email links not working bug [SCI-964]
|
2017-02-13 16:31:04 +01:00 |
|
Oleksii Kriuchykhin
|
f97c20e9b5
|
Fix hound warnings [SCI-999]
|
2017-02-13 15:42:28 +01:00 |
|
Oleksii Kriuchykhin
|
78d5cbb223
|
Add links to task completion notification [SCI-999]
|
2017-02-13 14:51:21 +01:00 |
|
Luka Murn
|
86be639a7c
|
Please the Hound
|
2017-02-13 14:20:44 +01:00 |
|
Luka Murn
|
3313d14316
|
Fix search for administrators and projects
Closes SCI-958.
|
2017-02-13 14:15:53 +01:00 |
|
Luka Murn
|
c6ed73bc82
|
Allow team admins to see all projects, even hidden ones
|
2017-02-13 13:42:53 +01:00 |
|
Luka Murn
|
f93cc89624
|
Fix system notification email links not working bug
Closes SCI-964.
|
2017-02-10 15:13:33 +01:00 |
|
Oleksii Kriuchykhin
|
cf8566df33
|
Add task complete/uncomplete functionality [SCI-999]
|
2017-02-10 14:27:20 +01:00 |
|
Luka Murn
|
3eb4faa44b
|
Fix task restore action
Closes SCI-991.
|
2017-02-10 14:08:56 +01:00 |
|
Luka Murn
|
280b7a0e75
|
Minor fix
|
2017-02-09 15:10:45 +01:00 |
|
Luka Murn
|
2a9f975c13
|
Some minor fixes
|
2017-02-09 14:58:11 +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 |
|
Luka Murn
|
5cb3eb5e09
|
Refactor preferences -> move them to subcontroller, subroute
|
2017-02-09 11:07:16 +01:00 |
|
okriuchykhin
|
c2a69982aa
|
Merge pull request #471 from okriuchykhin/ok_SCI_936
Adds datatable to all teams page [SCI-936]
|
2017-02-07 10:33:33 +01:00 |
|
okriuchykhin
|
e2de3c92e7
|
Merge pull request #472 from okriuchykhin/ok_SCI_984
Check that user is a member of a team when switching to it [SCI-984]
|
2017-02-07 09:36:46 +01:00 |
|
okriuchykhin
|
53ff6a2893
|
Merge pull request #473 from okriuchykhin/ok_SCI_997
Fix smart annotation is missing at editing column with smart annotation [SCI-997]
|
2017-02-07 09:33:40 +01:00 |
|
Oleksii Kriuchykhin
|
80dbc669d0
|
Simplify all teams dt definition [SCI-936]
|
2017-02-06 17:17:48 +01:00 |
|
Oleksii Kriuchykhin
|
449f4479e9
|
Fix code style issues [SCI-936]
|
2017-02-06 17:08:20 +01:00 |
|
zmagod
|
c99a540eb3
|
adds hook to team name in the invitation template [fixes SCI-930]
|
2017-02-03 16:53:42 +01:00 |
|
Oleksii Kriuchykhin
|
916ed2572a
|
Fix smart annotation is missing at editing column with smart annotation [SCI-997]
|
2017-02-03 16:42:38 +01:00 |
|
Oleksii Kriuchykhin
|
cc6b518c7f
|
Check that user is a member of a team when switching to it [SCI-984]
|
2017-02-03 16:10:37 +01:00 |
|
Oleksii Kriuchykhin
|
62535a01bd
|
Move teams datatable js code into separate file [SCI-936]
|
2017-02-03 10:44:42 +01:00 |
|
Oleksii Kriuchykhin
|
8b105aa030
|
Add override hooks [SCI-936]
|
2017-02-02 23:35:47 +01:00 |
|
Zmago Devetak
|
65bbd81497
|
Merge pull request #469 from ZmagoD/zd_SCI_929
Adds hook in user settings navigation
|
2017-02-02 15:01:37 +01:00 |
|
mlorb
|
970d99e6e3
|
Merge pull request #465 from mlorb/ml_sci_937
Redesign of individual team page [SCI-937]
|
2017-02-02 11:15:55 +01:00 |
|
mlorb
|
5510fa7751
|
rename data-hooks in team view
|
2017-02-02 10:36:23 +01:00 |
|
Oleksii Kriuchykhin
|
db90c5d63b
|
Add datatable to all teams page [SCI-936]
|
2017-02-02 09:53:59 +01:00 |
|
zmagod
|
bb42bd04a5
|
adds hook in user settings navigation
|
2017-02-01 17:10:22 +01:00 |
|
Mojca Lorber
|
86351ce17d
|
add data-hooks for billing
|
2017-02-01 15:01:54 +01:00 |
|
Mojca Lorber
|
d3e0eca44e
|
redesign individual team page
|
2017-02-01 14:44:47 +01:00 |
|
Oleksii Kriuchykhin
|
031741d122
|
Disable protocols link if user has no teams [SCI-934]
|
2017-02-01 14:26:51 +01:00 |
|
Oleksii Kriuchykhin
|
c119b7c014
|
Make sciNote work for users without any teams [SCI_934]
|
2017-02-01 14:16:26 +01:00 |
|
Zmago Devetak
|
5c9954bb89
|
Merge pull request #450 from ZmagoD/zd_SCI_939
Refactor "organizations" to "teams"
|
2017-02-01 13:12:02 +01:00 |
|
okriuchykhin
|
067b9452a4
|
Merge pull request #464 from okriuchykhin/ok_SCI_935
Add config option to enable/disable users registration [SCI-935]
|
2017-02-01 09:36:36 +01:00 |
|
Luka Murn
|
059f9cfb25
|
Merge pull request #468 from biosistemika/hotfix-1.7.2
Change URLs to sciNote help pages [SCI-978]
|
2017-01-31 16:15:39 +01:00 |
|
Luka Murn
|
db75231617
|
Update URLs to sciNote support pages
Closes SCI-978.
|
2017-01-31 15:48:56 +01:00 |
|
zmagod
|
be5faad97c
|
fixes hound
|
2017-01-31 13:33:55 +01:00 |
|
Oleksii Kriuchykhin
|
d1e69438de
|
Add config option to enable/disable users registration [SCI-935]
|
2017-01-30 15:04:02 +01:00 |
|
mlorb
|
bc8c4c3c6c
|
Merge pull request #463 from mlorb/ml_sci_965
Fix step does not save if table is without content [SCI-965]
|
2017-01-30 11:08:21 +01:00 |
|
Mojca Lorber
|
b291553d01
|
fix hound
|
2017-01-27 16:36:03 +01:00 |
|
Mojca Lorber
|
d5021fad2c
|
fix step does not save if table is without content
|
2017-01-27 16:25:11 +01:00 |
|
okriuchykhin
|
9909f9dcff
|
Merge pull request #456 from okriuchykhin/ok_SCI_951
Fix missing preview images in task and protocol management [SCI-951]
|
2017-01-27 14:42:41 +01:00 |
|
okriuchykhin
|
c6fe0003f4
|
Merge pull request #458 from okriuchykhin/ok_SCI_957
Fix protocol table filtering by keywords [SCI-957]
|
2017-01-27 14:19:53 +01:00 |
|
okriuchykhin
|
53e09bd50a
|
Merge pull request #457 from okriuchykhin/ok_SCI_955
Fix comments re-initialization after edit of the results [SCI-955]
|
2017-01-27 11:50:52 +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 |
|
zmagod
|
61b260fb8a
|
fixes bug in protocol management
|
2017-01-27 11:01:44 +01:00 |
|
mlorb
|
77236f161b
|
Merge pull request #461 from mlorb/ml_sci_952
Fix bug with avatar in smart annotations [SCI-952]
|
2017-01-27 10:08:53 +01:00 |
|
Luka Murn
|
2c3be391a8
|
Merge pull request #462 from ZmagoD/zd_SCI_962_vol2
fix edit action
|
2017-01-26 17:25:57 +01:00 |
|
Luka Murn
|
36f25e98f1
|
Merge pull request #459 from okriuchykhin/ok_SCI_943
Fix RTF toolbar init after eding new step [SCI-943]
|
2017-01-26 17:25:41 +01:00 |
|
zmagod
|
30912c514e
|
fix edit action
|
2017-01-26 17:24:24 +01:00 |
|
Mojca Lorber
|
5bed5f0f4a
|
fix bug with avatar in smart annotations
|
2017-01-26 17:15:00 +01:00 |
|
zmagod
|
cec5f1333d
|
fixes RTE bug for new text results [fixes SCI-962]
|
2017-01-26 16:54:43 +01:00 |
|
Oleksii Kriuchykhin
|
100cc700c6
|
Fix RTF toolbar init after eding new step [SCI-943]
|
2017-01-26 16:37:44 +01:00 |
|
Luka Murn
|
3bf447b0f4
|
Fix bug where reCaptcha form wasn't working
|
2017-01-26 16:06:29 +01:00 |
|
Oleksii Kriuchykhin
|
17a53cbd7f
|
Fix protocol table filtering by keywords [SCI-957]
|
2017-01-26 15:52:46 +01:00 |
|
Oleksii Kriuchykhin
|
ff86184b24
|
Fix comments re-initialization after edit of the results [SCI-955]
|
2017-01-26 15:24:37 +01:00 |
|
Oleksii Kriuchykhin
|
0f860496a7
|
Fix image preview after saving of report [SCI-951]
|
2017-01-26 14:42:14 +01:00 |
|
Luka Murn
|
3e6d11a087
|
Merge pull request #455 from mlorb/ml_sci_944
Fix entering new smart anotations [SCI-944]
|
2017-01-26 14:06:35 +01:00 |
|
Mojca Lorber
|
13d1cc5171
|
fix entering new smart anotations
|
2017-01-26 13:50:32 +01:00 |
|
Oleksii Kriuchykhin
|
08aa882155
|
Fix generation of image previews after protocol loading from repo [SCI-951]
|
2017-01-26 13:19:59 +01:00 |
|
Luka Murn
|
0baaf12de3
|
Re-display images & checkboxes in PDF reports
Closes SCI-953.
|
2017-01-26 10:46:58 +01:00 |
|
Luka Murn
|
8c5a52417c
|
Merge pull request #445 from okriuchykhin/ok_SCI_940
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:49:38 +01:00 |
|
okriuchykhin
|
648d256dff
|
Merge pull request #448 from okriuchykhin/ok_SCI_945
Fix openning of protocol preview with images [SCI-945]
|
2017-01-25 17:27:01 +01:00 |
|
okriuchykhin
|
6610c75bfc
|
Merge pull request #452 from okriuchykhin/ok_SCI_949
Fix error when referencing deleted sample in SA [SCI-949]
|
2017-01-25 17:26:48 +01:00 |
|
Oleksii Kriuchykhin
|
c55f3cb99c
|
Add flag to disable simple_format in custom_auto_link [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
Oleksii Kriuchykhin
|
310d8c1920
|
Refactor smart annotation/auto_link/simple_format rendering [SCI-940]
|
2017-01-25 17:18:19 +01:00 |
|
mlorb
|
bedef297c4
|
Merge pull request #453 from mlorb/ml_sci_950
Fix problem with protocol export [SCI-950]
|
2017-01-25 17:15:21 +01:00 |
|
okriuchykhin
|
4c0f68ffbd
|
Merge pull request #410 from okriuchykhin/ok_SCI_855
Improved tooltip handling in samples datatable V2 [SCI-855]
|
2017-01-25 16:19:52 +01:00 |
|
Mojca Lorber
|
99a40961fa
|
fix problem with protocol export
|
2017-01-25 16:12:48 +01:00 |
|
Oleksii Kriuchykhin
|
5fe9261595
|
Fix error when referencing deleted sample in SA [SCI-949]
|
2017-01-25 15:54:12 +01:00 |
|
zmagod
|
a507bb4d1f
|
hound
|
2017-01-25 15:40:35 +01:00 |
|
zmagod
|
1220466035
|
fixing hound
|
2017-01-25 15:00:14 +01:00 |
|
zmagod
|
afd8328e9c
|
rename ortanizations -> teams
|
2017-01-25 14:22:06 +01:00 |
|
Oleksii Kriuchykhin
|
ddd8bcf7b0
|
Prevent double initialization of popup [SCI-855]
|
2017-01-25 13:47:01 +01:00 |
|
Oleksii Kriuchykhin
|
96a9857dec
|
Add handling of popups in the end of the table [SCI-855]
|
2017-01-25 13:47:01 +01:00 |
|
Oleksii Kriuchykhin
|
fb49ce8be2
|
Improved tooltip handling in samples datatable [SCI-855]
|
2017-01-25 13:47:01 +01:00 |
|
Mojca Lorber
|
6905fc8c08
|
remove letter f
|
2017-01-25 13:20:11 +01:00 |
|
Oleksii Kriuchykhin
|
90e4b26c69
|
Fix openning of protocol preview with images [SCI-945]
|
2017-01-25 13:06:12 +01:00 |
|
zmagod
|
f04a2f663a
|
renamed organizations in config/
|
2017-01-25 12:30:11 +01:00 |
|
zmagod
|
8c035a1981
|
renames organization in assets
|
2017-01-25 12:12:27 +01:00 |
|
okriuchykhin
|
35b8638598
|
Merge pull request #446 from okriuchykhin/ok_SCI_902_v2
Add sanitization of group/type to sample edit [SCI-902]
|
2017-01-25 12:05:30 +01:00 |
|
zmagod
|
72e13beee3
|
renamed organizations in views
|
2017-01-25 12:01:23 +01:00 |
|
Mojca Lorber
|
2277af534c
|
fix table titles
|
2017-01-25 11:01:35 +01:00 |
|
zmagod
|
a6285f0431
|
renamed utilities
|
2017-01-25 10:24:50 +01:00 |
|
zmagod
|
9ae799d52c
|
rename organization/org/Organization to Team in datatables
|
2017-01-25 09:48:49 +01:00 |
|
zmagod
|
9d90b9b42a
|
rename Organization to Team in models
|
2017-01-24 17:08:48 +01:00 |
|
zmagod
|
c2c5616078
|
rename Organization to Team in controllers
|
2017-01-24 17:06:51 +01:00 |
|
Oleksii Kriuchykhin
|
fe6d6842c2
|
Add sanitization of group/type to sample edit [SCI-902]
|
2017-01-24 16:58:03 +01:00 |
|
zmagod
|
21c2f82582
|
rename controllers where org/organization
|
2017-01-24 16:57:14 +01:00 |
|
zmagod
|
a193850ae6
|
rename models where org/organization
|
2017-01-24 16:34:21 +01:00 |
|
Oleksii Kriuchykhin
|
365eef506c
|
Fixes merge conflicts with smart-annotations branch
|
2017-01-24 15:20:50 +01:00 |
|
okriuchykhin
|
f1483e4cad
|
Merge pull request #444 from okriuchykhin/ok_SCI_902_v2
Add sanitization to sample groups/types [SCI-902]
|
2017-01-24 14:44:55 +01:00 |
|
Oleksii Kriuchykhin
|
a04f05eeb3
|
Add sanitization to sample groups/types [SCI-902]
|
2017-01-24 14:39:54 +01:00 |
|
mlorb
|
02f314ce60
|
Merge pull request #443 from mlorb/ml_sci_919_v2
Remove table of content and customize link target [SCI-919]
|
2017-01-24 14:39:47 +01:00 |
|
Luka Murn
|
53699193a2
|
Merge branch 'smart-annotations'
Conflicts:
app/assets/javascripts/comments.js.erb
app/assets/javascripts/protocols/index.js
app/assets/javascripts/protocols/steps.js.erb
app/assets/javascripts/samples/sample_datatable.js.erb
app/controllers/my_module_comments_controller.rb
app/controllers/project_comments_controller.rb
app/controllers/result_comments_controller.rb
app/controllers/step_comments_controller.rb
app/datatables/sample_datatable.rb
app/views/my_module_comments/_comment.html.erb
app/views/project_comments/_comment.html.erb
app/views/projects/show/_experiment.html.erb
app/views/reports/elements/_experiment_element.html.erb
app/views/reports/elements/_result_comments_element.html.erb
app/views/reports/elements/_result_text_element.html.erb
app/views/reports/elements/_step_checklist_element.html.erb
app/views/reports/elements/_step_comments_element.html.erb
app/views/reports/elements/_step_element.html.erb
app/views/result_comments/_comment.html.erb
app/views/results/_result_text.html.erb
app/views/step_comments/_comment.html.erb
app/views/steps/_step.html.erb
db/schema.rb
|
2017-01-24 14:33:23 +01:00 |
|
Mojca Lorber
|
4dc7998fdd
|
Remove table of content and customize link target
|
2017-01-24 13:10:01 +01:00 |
|
Zmago Devetak
|
40bf293ec7
|
Merge pull request #441 from ZmagoD/zd_SCI_924
adds smart annotation in task comments, refactor smart_annotation_par…
|
2017-01-24 11:18:41 +01:00 |
|
mlorb
|
4253e3de2b
|
Merge pull request #439 from mlorb/ml_sci_919
Remove functionalities from rich text formatting [SCI-919]
|
2017-01-24 11:03:34 +01:00 |
|
mz3944
|
34f832d123
|
Merge pull request #437 from mz3944/mz-sci-913
Added smart annotations when adding new sample in samples table [SCI-913]
|
2017-01-24 11:03:00 +01:00 |
|
okriuchykhin
|
7fa1f3d966
|
Merge pull request #438 from okriuchykhin/ok_SCI_921
Remove unneeded HTML scrubber in protocol importer [SCI-921]
|
2017-01-24 11:02:43 +01:00 |
|
Matej Zrimšek
|
b48e48e100
|
Prevent sample row in samples datatable from toggling when clicking on smart annotation link. [SCI-913]
|
2017-01-24 10:56:10 +01:00 |
|
zmagod
|
6e7fa21dd3
|
adds smart annotation in task comments, refactor smart_annotation_parser method, fix the user popover description [fixes SCI-924]
|
2017-01-24 10:51:12 +01:00 |
|
Matej Zrimšek
|
2e041d9e81
|
Added smart annotations when adding new sample in samples table. [SCI-913]
|
2017-01-24 10:23:26 +01:00 |
|
Oleksii Kriuchykhin
|
2434c73a0c
|
Remove unneeded HTML scrabber in protocol importer [SCI-921]
|
2017-01-24 09:52:38 +01:00 |
|
Mojca Lorber
|
eb40513ada
|
remove functionalities from rich text formatting
|
2017-01-24 09:44:37 +01:00 |
|
Oleksii Kriuchykhin
|
401b37956b
|
Simplify protocol export start [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
Oleksii Kriuchykhin
|
d555ba7905
|
Add export to protocol management page and code style improvements [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
Oleksii Kriuchykhin
|
14a6705b55
|
Implemented protocol export through Zip::OutputStream [SCI-742]
|
2017-01-23 17:43:48 +01:00 |
|
Oleksii Kriuchykhin
|
1abd7fc574
|
Added xml schemas and zip gem [SCI-742]
|
2017-01-23 17:34:02 +01:00 |
|
Oleksii Kriuchykhin
|
69f31a62e7
|
Initial code commit [SCI-742]
|
2017-01-23 17:33:10 +01:00 |
|
Zmago Devetak
|
674999f987
|
Merge pull request #436 from ZmagoD/zd_SCI_922
fixed user without permissions bug [fixes SCI-922]
|
2017-01-23 17:25:07 +01:00 |
|
zmagod
|
20cde2654b
|
fixed user without permissions bug [fixes SCI-922]
|
2017-01-23 10:53:42 +01:00 |
|
zmagod
|
9c3bc8dac7
|
fixes checklist item user popover bug [fixes SCI-907]
|
2017-01-23 09:47:04 +01:00 |
|
mz3944
|
fd63a1de12
|
Merge pull request #432 from mlorb/ml-sci-fix-847
Add dynamic length for sample type/group field when adding new sample [SCI-847]
|
2017-01-20 15:46:34 +01:00 |
|
mlorb
|
2d073c8c04
|
Merge pull request #430 from mlorb/ml_sci_826
Display smart annotations in reports [SCi-826]
|
2017-01-20 13:49:40 +01:00 |
|
Mojca Lorber
|
8e02c2e025
|
add locale - fix
|
2017-01-20 13:37:07 +01:00 |
|
mz3944
|
18a2e4c423
|
Merge pull request #433 from mz3944/mz-sci-914
Edit of a sample in sample table does not work
|
2017-01-20 13:02:05 +01:00 |
|
Zmago Devetak
|
c1e7cc83a7
|
Merge pull request #434 from ZmagoD/zd_SCI_915
Text is deleted when entering smart annotation in rich text editor
|
2017-01-20 13:01:29 +01:00 |
|
Zmago Devetak
|
7bd368e002
|
Merge pull request #431 from ZmagoD/zd_add_code_highlight
Fixes code highlight and smart annotations experiments bug
|
2017-01-20 12:59:21 +01:00 |
|
mlorb
|
9a3c56de97
|
Merge pull request #421 from mlorb/ml_sci_540
Protocol steps/results - adding titles for tables [SCI-540]
|
2017-01-20 11:41:49 +01:00 |
|
zmagod
|
71453398b1
|
bugfix
|
2017-01-20 11:33:49 +01:00 |
|
zmagod
|
4f7d62e79d
|
removes unneeded annotations [fixes SCI-915]
|
2017-01-20 11:33:10 +01:00 |
|
Matej Zrimšek
|
5d65627808
|
Fixed sample editing in samples table. [SCI-914]
|
2017-01-20 11:10:17 +01:00 |
|
Mojca Lorber
|
3789769af3
|
add dynamic length for sample type/group field when adding new sample
|
2017-01-20 09:53:44 +01:00 |
|
zmagod
|
9550c6dd35
|
fixes highlight.js
|
2017-01-19 17:09:25 +01:00 |
|
Mojca Lorber
|
6653f0d4c1
|
small fixes
|
2017-01-19 16:42:14 +01:00 |
|
Mojca Lorber
|
6de83ff53b
|
fix hound
|
2017-01-19 15:58:40 +01:00 |
|
Mojca Lorber
|
4ea154410a
|
add to fields with rich text formatting
|
2017-01-19 15:27:24 +01:00 |
|
Matej Zrimšek
|
54f8b01341
|
Removed smart annotation filter button disabling, when no results are found for that filter (so that 'no result found' displays instead). [SCI-894]
|
2017-01-19 15:26:28 +01:00 |
|
Mojca Lorber
|
44de927cf4
|
display smart annotations in reports - without rich text fields
|
2017-01-19 14:22:54 +01:00 |
|
Oleksii Kriuchykhin
|
890c5e3c3d
|
Add “no results found” message in smart annotation [SCI-886]
|
2017-01-19 13:42:58 +01:00 |
|
Zmago Devetak
|
039a8d7da6
|
Merge pull request #426 from ZmagoD/zd_add_tinyMCE
Add tiny mce
|
2017-01-19 12:57:55 +01:00 |
|
zmagod
|
2cbb8ba41a
|
removed unneeded comments
|
2017-01-19 12:54:48 +01:00 |
|
mz3944
|
da604d2619
|
Merge pull request #427 from mz3944/mz-sci-908
Some smart annotations refactoring [SCI-908]
|
2017-01-19 12:15:20 +01:00 |
|
zmagod
|
f2d5066dc7
|
fix some bugs
|
2017-01-19 11:37:59 +01:00 |
|
Matej Zrimšek
|
5d86bbb812
|
Smart annotations improved documentation. [SCI-908]
|
2017-01-19 10:56:02 +01:00 |
|
Matej Zrimšek
|
fec83e8c45
|
Smart annotations refactoring. [SCI-908]
|
2017-01-19 10:55:43 +01:00 |
|
zmagod
|
2ccafdd670
|
bug fix
|
2017-01-19 10:12:01 +01:00 |
|