Commit graph

2549 commits

Author SHA1 Message Date
zmagod c636ca4276 refactor user preferences and profile page 2017-09-20 11:17:59 +02:00
Zmago Devetak 76a42f7fb7 Merge pull request #791 from ZmagoD/zd_SCI_1622
fixes profile page route, moves source files out of packs folder, res…
2017-09-19 13:39:00 +02:00
zmagod 40af99c57f fix hound v2 2017-09-19 13:36:51 +02:00
zmagod 8416ccc5c2 fixes hound alerts 2017-09-19 13:33:43 +02:00
zmagod 88928be2d3 fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622] 2017-09-19 13:08:08 +02:00
Zmago Devetak 4e8381d9ba Merge pull request #781 from ZmagoD/zd_SCI_1499
Write single team page in React.js
2017-09-18 15:59:44 +02:00
zmagod 015026926d refactor 2017-09-18 15:46:24 +02:00
zmagod f0a8275559 fixes merge conflicts 2017-09-18 15:36:33 +02:00
zmagod b9492daa69 fixes changeTeam method 2017-09-18 15:16:07 +02:00
zmagod d1477179b2 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499 2017-09-18 15:10:52 +02:00
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
zmagod 40359c5c73 fixed edit name modal 2017-09-15 16:34:05 +02:00
zmagod 83647d81b4 adds edit team name modal 2017-09-15 14:00:48 +02:00
zmagod 1a00b53034 adds user_team tests 2017-09-14 13:11:19 +02:00
Toni Dezman d38f4343f2 Decupling redux part 1 2017-09-14 11:46:49 +02:00
zmagod 705d07f60e adds remove team action 2017-09-13 17:11:51 +02:00
zmagod 1b3b3dfea9 adds team members update role functionality 2017-09-12 17:30:13 +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
zmagod 9c01ab414c refactor leave team 2017-09-01 17:10:43 +02:00
Toni Dezman f7f653ffd1 Adds .feature files for Cucumber specifications 2017-09-01 09:24:36 +02:00
zmagod 91d2d8a935 adds team details view 2017-08-31 15:56:55 +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
zmagod 1325732b0c adds specs for team controller actions 2017-08-30 16:18:21 +02:00
Toni Dezman 2e6a942152 api for timezone 2017-08-30 14:59:17 +02:00
zmagod ee054f91b8 adds bullet gem [fixes SCI-1578] 2017-08-30 09:29:45 +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