scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-05 23:17:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
11930 commits 77 branches 180 tags 167 MiB
Commit graph

11930 commits

This branch
This branch
All branches
Author SHA1 Message Date
zmagod
c54dd9473e adds controller spec for leave team [fixes SCI-1497] 2017-08-29 11:56:46 +02:00
zmagod
478bd491ff added pagination and sorting to team tables 2017-08-28 17:05:09 +02:00
zmagod
5ea464b675 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497 2017-08-28 09:36:29 +02:00
zmagod
0cc00f292a adds leave button to modal 2017-08-28 09:36:21 +02:00
Toni Dezman
ea9a195f09 email and password action/redusers work 2017-08-26 14:07:31 +02:00
Toni Dezman
eb0641d76a InputEnabled submits form with ENTER 2017-08-26 13:04:36 +02:00
zmagod
7b5b4c957c adds formated messages in modal 2017-08-25 16:40:23 +02:00
zmagod
db16da7bd6 adds custom query to fetch teams data 2017-08-25 16:07:37 +02:00
Toni Dezman
ccd14f6b50 adds apis for full_name and initials input fields 2017-08-25 14:45:02 +02:00
Toni Dezman
989be6563f Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-08-25 09:06:38 +02:00
Zmago Devetak
5f6bac84b1 Merge pull request #775 from ZmagoD/zd_SCI_1493_v3 
Copy sciNote header functionality into Settings React.js
 2017-08-25 09:02:45 +02:00
zmagod
34be62a648 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3 2017-08-25 08:58:20 +02:00
zmagod
782daabce1 first run 2017-08-25 08:54:32 +02:00
Toni Dezman
e4a704d063 namespaces client_api/users/user_controller.rb 2017-08-25 08:21:52 +02:00
Toni Dezman
4ea4c30e29 extracts route magic strings to routes constants 2017-08-25 08:20:40 +02:00
Zmago Devetak
994b08fcfc Merge pull request #752 from ZmagoD/testin-rails-5-addons 
fix background worker bug
 2017-08-25 08:05:21 +02:00
Toni Dezman
5733d79943 Merge pull request #776 from programmertoni/td_SCI_1494_v2 
Settings Page
 2017-08-24 10:25:26 +02:00
Toni Dezman
3c6f66ebd3 Merge branch 'decoupling-settings-page' into td_SCI_1494_v2 2017-08-24 10:23:30 +02:00
Zmago Devetak
f0a2b11a84 Merge pull request #777 from ZmagoD/zd_SCI_1570 
fix eslint import/no-unresolved errors reports [fixes SCI-1570]
 2017-08-24 09:53:27 +02:00
Toni Dezman
8a7154fa47 changes disabled switches code 2017-08-24 09:37:06 +02:00
Toni Dezman
de5136f9cb fixes navigation container 2017-08-24 09:22:37 +02:00
zmagod
66ee2af132 fix eslint import/no-unresolved errors reports [fixes SCI-1570] 2017-08-24 09:20:44 +02:00
Luka Murn
5ab524dbd3 Merge pull request #773 from Ducz0r/lm-sci-1496 
Add basic datatables & datagrid [SCI-1496]
 2017-08-24 09:02:57 +02:00
Toni Dezman
309e52b806 extracts navigation to <MainNav /> component 2017-08-24 08:56:17 +02:00
Toni Dezman
12db6e790f removes styles from time-zone and changes clicking on switches 2017-08-24 08:35:55 +02:00
zmagod
afa05c8c14 fixed background worker in dev env 2017-08-23 17:10:45 +02:00
Toni Dezman
f1cad5d446 checkouts Gemfile.lock from decupling-settings-page 2017-08-23 13:19:45 +02:00
Toni Dezman
70cf62712d adds Gemfile.lock file 2017-08-23 11:54:18 +02:00
Toni Dezman
b02117ea67 implements code review suggestions 2017-08-23 11:20:10 +02:00
Luka Murn
39bb8ecdab Fix code 2017-08-23 10:54:54 +02:00
Luka Murn
647c879c76 Merge pull request #769 from Ducz0r/lm-sci-1475 
Refactor user settings into a jsonb field [SCI-1475]
 2017-08-23 08:43:23 +02:00
Luka Murn
8e999e673a Remove scinote-web.tgz from index 2017-08-23 08:40:47 +02:00
Luka Murn
67017d383c Merge pull request #761 from Ducz0r/lm-add-versions-rake-file 
Add versions Rake
 2017-08-23 08:36:45 +02:00
Luka Murn
5ee7fd895c Moved the arrays into json 2017-08-23 08:35:48 +02:00
Toni Dezman
1dfd7a0cee adds i18n and 404 page 2017-08-22 15:54:47 +02:00
Luka Murn
b6eb46471a Merge pull request #753 from Ducz0r/lm-remove-some-code 
Remove some code we're no longer maintaining
 2017-08-22 14:04:04 +02:00
zmagod
94403a545c add labels to navigation items [fixes SCI-1493] 2017-08-22 14:00:28 +02:00
zmagod
3a2a1205e3 style global activities 2017-08-22 13:20:06 +02:00
Toni Dezman
42d5e67581 moves components to nicer folder structure 2017-08-22 12:56:29 +02:00
Toni Dezman
692df427b2 adds wildcard for settings/*all to show react 404 page 2017-08-22 10:35:18 +02:00
Toni Dezman
bda9704e10 changess to settings/app.jsx 2017-08-22 10:11:47 +02:00
Toni Dezman
d1583a86f5 adds SettingsProfile 2017-08-22 10:08:16 +02:00
Toni Dezman
b29df328d9 some additional styles 2017-08-22 09:49:23 +02:00
Toni Dezman
dc746cbf6f a lot of styles for Settings page 2017-08-22 09:49:02 +02:00
Toni Dezman
5352791d46 styles to icons in Notifications 2017-08-22 09:47:36 +02:00
Toni Dezman
3c20ef5fea fixes TimeZone dropdown position: relative issue 2017-08-22 09:47:20 +02:00
Toni Dezman
3e6d45e82f adds Notification Switches 2017-08-22 09:46:59 +02:00
Toni Dezman
dd5c329ef1 makes redux work with Notifications 2017-08-22 09:46:44 +02:00
Toni Dezman
522262f9fe adds timezone 2017-08-22 09:46:29 +02:00
Toni Dezman
52b1603b92 adds MyStatistics logic 2017-08-22 09:44:51 +02:00