Oleksii Kriuchykhin
db90c5d63b
Add datatable to all teams page [SCI-936]
2017-02-02 09:53:59 +01:00
zmagod
be5faad97c
fixes hound
2017-01-31 13:33:55 +01:00
zmagod
8c035a1981
renames organization in assets
2017-01-25 12:12:27 +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
Luka Murn
a2935c6620
Add sample info modal popup to sample smart annotations
...
This MR also loads datatables.js globally (as it's required by
the modal), so I removed it everywhere in code, and it shouldn't
be used anymore (e.g. '//= require datatables').
Closes SCI-892.
2017-01-16 15:52:02 +01:00
zmagod
ac52e643be
cleanup direct upload
2016-12-08 11:26:13 +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
b246853117
Code styling (use link_to, %w)
2016-11-08 16:43:25 +01:00
Luka Murn
0ab62576a2
Add new modal to organization page, remove old modal code
2016-11-07 09:43:10 +01:00
Oleksii Kriuchykhin
347216183f
Fixes different color of buttons in notifications settings [SCI-590]
2016-10-20 14:17:07 +02:00
Matej Zrimšek
05acf5a725
Replaced all Ruby constants instances in JS to be called from JS.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Mojca Lorber
6bea0a9e1a
fixes merge conflicts
2016-10-12 10:55:40 +02:00
Mojca Lorber
4f1cbad7da
adding update notifications in settings
2016-10-12 10:42:07 +02:00
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
zmagod
a68e7abc57
first run notification settings
2016-10-04 15:52:48 +02:00
Matej Zrimšek
c2f0106993
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
2016-09-16 15:56:44 +02:00
Luka Murn
81883911c4
Merge pull request #132 from Ducz0r/lm-sci-228
...
Updates to invite users to team modal window
2016-09-05 15:53:15 +02:00
Luka Murn
1d8600b39f
Fix bug when inviting existing users onto teams
...
Closes SCI-228
2016-09-05 14:52:56 +02:00
Matej Zrimšek
828eebeb16
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
2016-08-31 17:21:17 +02:00
Matej Zrimšek
e4a6a3944e
Added deleting of files on S3 server when editing/removing a file. Some refactoring.
2016-08-17 18:13:35 +02:00
Matej Zrimšek
ccdccc5cf1
Changed file uploding to work properly with multiple files and be user friendly in case of errors. Some function names refactoring.
2016-08-17 18:11:13 +02:00
Matej Zrimšek
c87ba5b45c
Multiple files upload handling and user experience improved. Spinner now also prevents user from accidentally leaving page.
2016-08-17 18:10:32 +02:00
Matej Zrimšek
951cf67b3d
A lot of file uploading edge cases considered. File uploading is now actually redirected to S3 server, as before was not. Error functions changed and error output format specified, which should be used consistently throughout the application. Some other refactoring.
2016-08-17 18:08:21 +02:00
Matej Zrimšek
b70f49f4e0
Some additional refinements.
2016-08-17 18:00:04 +02:00
Matej Zrimšek
86880f0299
Additional changes, refactoring and improvements.
2016-08-17 17:57:54 +02:00
Matej Zrimšek
01aad1764c
Some hotfixes to previous commit. Client-side file validation added (except file type validation). Some refactoring.
2016-08-17 17:54:45 +02:00
Luka Murn
076b67620f
Migration GitLab -> GitHub
2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8
Initial commit.
2016-02-12 16:52:43 +01:00
