Commit graph

1304 commits

Author SHA1 Message Date
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
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
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
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
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