scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 02:46:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
3325 commits 69 branches 179 tags 165 MiB
Commit graph

3325 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Žan Žagar 706031dacb added model and controler, model should go to services while the controller should go to protocols controller 2017-09-12 15:25:22 +02:00
Toni Dezman 2bc84b6c19 Merge branch 'decoupling-settings-page' into td_SCI_1565 2017-09-12 10:44:49 +02:00
Žan Žagar fdbae19156 changed .json to .txt for clarity 2017-09-12 09:33:18 +02:00
Žan Žagar 2a7a2b8fa1 Changed some minor button text and fixed a local error 2017-09-12 09:26:22 +02:00
Žan Žagar 62350d0d42 Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later 2017-09-11 16:03:33 +02:00
Žan Žagar 9b640c5df8 Dropdown menu works, need to add backend code for the second button 2017-09-11 15:28:48 +02:00
Žan Žagar 0f4dadefa9 prvi (star gumb) v dropdownu sedaj deluje 2017-09-11 15:23:09 +02:00
Žan Žagar f668f60237 dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni 2017-09-11 15:22:22 +02:00
Žan Žagar 2c0a458aaf dodav moj alternativni text za importanje (text na gumbu), za rails translate (t) 2017-09-11 15:21:35 +02:00
Žan Žagar 31e8c107fd dodav na pravi branch te file 2017-09-11 14:35:00 +02:00
Toni Dezman 1cd9cd92fc adds global spinner 2017-09-11 14:30:49 +02:00
Jure Grabnar b4a13dffe3 init commit, dodav na protocols index gumb z dropdown 2017-09-11 13:07:22 +02:00
mlorb 03743a21f6 Merge pull request #786 from mlorb/ml-sci-1587 
Fix bugs with importing samples [SCI-1587]
 2017-09-08 09:19:35 +02:00
Mojca Lorber a0f7030a70 fix bug with tinyMCE text validaton 2017-09-07 14:54:12 +02:00
Toni Dezman 67d617deb5 adds hound_bot's and zmagos suggestions 2017-09-07 13:40:53 +02:00
Mojca Lorber 0e14420193 fix bugs with importing samples 2017-09-06 14:41:14 +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
Luka Murn c44c5b37bb Merge pull request #785 from okriuchykhin/ok_GIOT_29 
Add validation for uid uniqness [GIOT-29]
 2017-09-01 17:04:38 +02:00
Oleksii Kriuchykhin fc0e2d2172 Add validation for uid uniqness [GIOT-29] 2017-09-01 17:00:13 +02:00
okriuchykhin 91233a97c4 Merge pull request #784 from okriuchykhin/ok_GIOT_31 
Improve error logging [GIOT-31]
 2017-09-01 16:42:23 +02:00
Oleksii Kriuchykhin a927c2832d Improve error logging [GIOT-31] 2017-09-01 16:36:45 +02:00
Luka Murn 8463c89386 Update Gemfile 2017-09-01 09:36:40 +02:00
Toni Dezman f7f653ffd1 Adds .feature files for Cucumber specifications 2017-09-01 09:24:36 +02:00
Luka Murn e5bfb3c42d Rollback migration version 2017-09-01 09:06:25 +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
okriuchykhin ccf60fba7d Merge pull request #779 from okriuchykhin/ok_SCI_1579 
Backport API to Rails-4 [SCI-1579]
 2017-08-30 13:32:21 +02:00
Oleksii Kriuchykhin c3fceb90df Backport API to Rails-4 [SCI-1579] 2017-08-30 13:30:41 +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