scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
2530 commits 70 branches 179 tags 165 MiB
Commit graph

2530 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toni Dezman 39c9b708bd Merge pull request #780 from programmertoni/td_SCI_1565 
Td sci 1565
 2017-09-18 11:37:19 +02:00
Toni Dezman f144e057b7 Merge pull request #789 from programmertoni/td_SCI-1600_spinner 
Global Spinner
 2017-09-18 11:36:25 +02:00
Toni Dezman d38f4343f2 Decupling redux part 1 2017-09-14 11:46:49 +02:00
Toni Dezman 2bc84b6c19 Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-09-12 10:44:49 +02:00
Toni Dezman 1cd9cd92fc adds global spinner 2017-09-11 14:30:49 +02:00
Toni Dezman 67d617deb5 adds hound_bot's and zmagos suggestions 2017-09-07 13:40:53 +02:00
Toni Dezman b7bed5b5fe changes double quotes with single quotes 2017-09-05 14:47:05 +02:00
Toni Dezman b2e969459c adds controller unit tests 2017-09-05 14:43:35 +02:00
Toni Dezman ef023c5ca6 Merge pull request #783 from programmertoni/td_SCI-1571 
Adds .feature files for Cucumber specifications
 2017-09-05 09:50:26 +02:00
Toni Dezman df1fb6286b renames rspec file to _spec.rb 2017-09-04 15:13:55 +02:00
Toni Dezman 185039bc99 adds suggestions from code review 2017-09-04 15:00:26 +02:00
Toni Dezman 6a4c43b9c0 moves .feature files to features folder 2017-09-04 11:57:35 +02:00
Toni Dezman f7f653ffd1 Adds .feature files for Cucumber specifications 2017-09-01 09:24:36 +02:00
Toni Dezman c3f46d4877 adds hounds suggestions on improving the code 2017-08-31 13:24:57 +02:00
Toni Dezman 77a6a99513 fixes 404 request error 2017-08-31 13:03:15 +02:00
Toni Dezman 4034400c42 Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-08-31 11:42:15 +02:00
Toni Dezman 8b61fe563c user preferences APIs 2017-08-31 11:23:44 +02:00
Toni Dezman 2e6a942152 api for timezone 2017-08-30 14:59:17 +02:00
Zmago Devetak 6159b18533 Merge pull request #778 from ZmagoD/zd_SCI_1497 
Rewrite all teams page into React.js
 2017-08-29 13:36:04 +02:00
Toni Dezman c82dfa502a adds errors in client_api for users_controller 2017-08-29 13:14:52 +02:00
zmagod f7cb395b6a fix hound v2 2017-08-29 13:11:42 +02:00
zmagod df0bca363c fix hound 2017-08-29 13:10:18 +02:00
zmagod ec86691659 fixed tests 2017-08-29 12:04:00 +02:00
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
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
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