github.com/ifmeorg/ifme commits | Ecosyste.ms: OpenCollective

Merge pull request #93 from bellawoo/i18n-en

i18n: Update en.yml and view labels

55d2a5bf3f7b6b5cc0c34981c7d87ce0aa9bac3a authored almost 9 years ago

en translations for triggers

e21c4a88360772216274050b09dcc61504d6260f authored almost 9 years ago

en translations to strategies

6916874e7148fd20e90aa94169bfc85297479ee1 authored almost 9 years ago

en translations for search and header

3a6aa53fe43d6f6115fe126f38d7939776c9453e authored almost 9 years ago

en translations for profile and fix typo in trigger show

d7c0f9d67f70bd6189eacc41aeadadb161fcdf8f authored almost 9 years ago

en translations for meetings mood and pages

aee5148c6e60ade4abdb9bf14bf58c31e35920d6 authored almost 9 years ago

en translations for medications views

6b2491d01d15c013742d2128e59405fb3a9a0baa authored almost 9 years ago

en translations for app layout

b6b887c5aebf273212e1b1e2ae3e1c61c5c7120c authored almost 9 years ago

en translations for group labels

da9ee69e39baf2bce452d7914cc35393887a4adb authored almost 9 years ago

en translations added

6c68209f8ef8d9e168bb1e304d2289fb42947b91 authored almost 9 years ago

including subtitles and errors

f414e20bf55cd8565a95b6db883165118180d5eb authored almost 9 years ago

added non-label static text en translations

5f0272ccedee2a8a161f756b6d650699dedc72cb authored almost 9 years ago

en labels done for alerts and allies views

2adfea5ae6fd83c826feb107a329755df3f214e0 authored almost 9 years ago

i18n partials scoping correctly. set up structure for balance of views

6dcc22b57cfd6c63d70d384d6ddd3d1e7c46c03d authored almost 9 years ago

Fixed page not display bug on allies index

e0c0fcff5e94684a372b0874ece7e65fe307e850 authored about 9 years ago

Readded are_allies method

6737ed71f5a844811c8bee6f0924851d3290679b authored about 9 years ago

Updated seeds for Allies refactor

c5c85511ff20954e100ce04438786b15b0bc7505 authored about 9 years ago

Merge pull request #85 from fpcyan/master

Changes deprecates filenames and began adding model associations

70bf1fabb5dad31bd16f8fa3db10afb7b1102799 authored about 9 years ago

Merge pull request #86 from wdhorton/allies-by-status

Refactoring allies

f94da9398688507c6d39ff3c9beaa8b41ea4e425 authored about 9 years ago

Fix problem with status in AlliesController#add.

79f6cfebde46ba63e35a31adb1764c43a8518a65 authored about 9 years ago

Ensure that both inverse allyships are updated when one is approved.

aa48b5da55f9335f21ecba6c680fb195f4f6a2cc authored about 9 years ago

Refactor references to AlliesController#add and AlliesController#remove to send correct params for changed methods.

ce94a1c8ab3e22cd7d7c8eaa5300685658465fce authored about 9 years ago

Simplify AlliesController#remove method.

576fa3f400409c52533b7050719c80f757f3b838 authored about 9 years ago

Simplify AlliesController#add method.

2cc6b27f991bd892482301f2274a4d72ea3cac27 authored about 9 years ago

Refactor references to @outgoing_ally_requests and @incoming_ally_requests to take in array of User objects rather than ids.

40a9388285cf6856c16b14a2a7b4bc301bb7b651 authored about 9 years ago

Update tests to new statuses pending_from_ally and pending_from_user.

a72ae1ce43f3e6e3c112ac1dd2c160da2e66982a authored about 9 years ago

Refactor references to user_relation.

383247cc4fda1a6f83fd9750d5f829d8b4ca52d3 authored about 9 years ago

Remove are_allies and are_pending_allies from ApplicationController.

f642871388523f928670dbe183042a9865a22d88 authored about 9 years ago

Remove user_relation from ApplicationController (to be replaced in User model if needed).

cecc5de570193f32ce98a292f85442c7f83d9eb4 authored about 9 years ago

Refactor User#accepted_allies to more general User#allies_by_status. Replace calls to current_user.accepted_allies with new method.

bea1ac931eb0fe79adc06e8e1f0e97e023a33303 authored about 9 years ago

Remove AllyStatus module from ApplicationController.

4613bac0671fa25265ee465cadcad52a9b4988a7 authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

Merge from upstream

cee33de539e138db909d487718edac8714fdda85 authored about 9 years ago

added associations to alerts and user

8a75331486e3fd78335589c19d247dcc5750cfe0 authored about 9 years ago

changed all mentions of userid to user_id for alerts

3a03871ca6fdb1dc2d36dc9747d4d6e704e9146a authored about 9 years ago

changed name of userid column on alerts table

fc84c712b4fa80895807b919a5753535d07555a0 authored about 9 years ago

changed the no_taxonomies_error method to a one-liner

86a902ead6149048a083d37cccc115dd9be8be1a authored about 9 years ago

fix conflict with updated source

bbefc63f7c4ae4233606af8a8ae67336d3ec04d7 authored about 9 years ago

Updated lines in ckeditor and application.html.erb to more convential syntax or formatting. application.html.erb conditions may be a target for refactoring and a change to dependency injection -- i.e Controllers should dictate their titles. Devise controller should handle devise-related renderings, etc.

9bf27dee3d010a28d672a9ae5459d352c17df746 authored about 9 years ago

Removed .css from all of the stylesheet assets. .css.scss is deprecated for just .scss

3738588b433531328595d055c624496e627a6fc0 authored about 9 years ago

Fix error pages tests

35e893cf053dcc47a24195050ea3e5ce007e98f6 authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

87c7239e27819294aeb108835efcd894c4e50eb6 authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

ab702a8848ddc591f5410220f7f050bf341faf6e authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

ffec30cb2c7b8675a94d06be23833bc30dc0c101 authored about 9 years ago

Update allyship helpers and fix seeds

462c5ccbf8737d9826e3b055e8a324c52a37eaed authored about 9 years ago

Update allyship helpers and fix seeds

902bb46a6d53a41d211cef01406fd4a3e47eebc7 authored about 9 years ago

add pry-rails gem to development and test gemfile

985ebcaeb65ea6be37fd93ffab246d8322fb430d authored about 9 years ago

add ruby-graphviz gem

af109d14117372268c0759e396725fba4468e812 authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

9fef77ca1b5336d1e785fe3631a7932056ca995e authored about 9 years ago

Replace Allyship with Ally in seeds.rb

078bc93d4e9d3c6d56374ece8dc9ed31d924e5eb authored about 9 years ago

Merge pull request #79 from wdhorton/add-ar-relations

Add ActiveRecord relations to Users and Allies

bb77f65d3b3b5408805399464c7ca03b58b147cf authored about 9 years ago

Added blog entry

98bf25200bcd2b6305d40b8ee590a3fe3e5fe48e authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme into add-ar-relations

Get changes from upstream.

0027fc7009499c71dd1e1451cfc9cfe4606016cd authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

225ace5ec0c3bfd9bf7e1aa864bdfb8108f0cdeb authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

Get changes from upstream.

9db82357876fc71c1de8dda09f17ea6fb70f1f3d authored about 9 years ago

Cleaned up UI in all forms, fixed all empty field indicators

f2ba2fb800aa3f0772872a47eaf52347f4986129 authored about 9 years ago

Update allyships schema.

06f7122af3687b90e5f16fb793c5bbc27d313d47 authored about 9 years ago

Cleaned up UI in all forms, fixed all empty field indicators

51f716af1332cb8cebf26aa4ecd4ed0d2ae6315b authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

bring up to date with source

914b6572e0c01e6bd45573530aa1dac608ae6b23 authored about 9 years ago

Save medication refill date to Google calendar

d4cc4a694ec3f1cd3b36e610aaa9d5f21fba3dd6 authored about 9 years ago

Fixed bug hiding contributor name and typo in privacy policy

63a5d8859c4ace5afdd6b1c9f29b9f396aaf376c authored about 9 years ago

Resolve merge conflicts.

3387b71da5f6bde2abef79e688b9b34145456a49 authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

Get the latest changes from upstream.

16c684f593cc1c7ce06dfdfac7f4bfe5e896b605 authored about 9 years ago

Fix for header refactoring

626cf97f50b9751365b7a73c91dc0592615096dd authored about 9 years ago

Remove get_accepted_allies method from ApplicationController and put accepted_allies on the User model.

95b554a57206968aea8daa2e50fd0a8b38bd19a9 authored about 9 years ago

Refactor User and Ally model to use ActiveRecord relations.

1ebd09495cc4fd20a6dfa0ff4a5ea3e5bbeb09bb authored about 9 years ago

Merge pull request #73 from danielglatstein/master

add annotate, rails-erd and better_errors to gemfile

5491b6d96a077deee8cc648d8502fd80fe97b87b authored about 9 years ago

Merge pull request #72 from chenghw/master

update readme

042a5882e5bd3960146d57f3433f8c7293018e8b authored about 9 years ago

Merge pull request #75 from wdhorton/delete-rdoc

Delete empty README.rdoc.

96b3a17b97a55c8e8de706d1494007e064091607 authored about 9 years ago

Delete empty README.rdoc.

e698ded2030d99188de795058de879f6e4cd8bab authored about 9 years ago

Initial commit.

646aa9a5e49d94f4226a7857d34854949cbdbf10 authored about 9 years ago

add annotate, rails-erd and better_errors to gemfile

463607a74031849f23f0e2563a5b205fbd5f0e0b authored about 9 years ago

update readme

48e2b4d7c929a6040911624acd6c85224be42eca authored about 9 years ago

removed the rdoc

3fb74c15894493e0f260ce2c2a60324270bfcc71 authored about 9 years ago

Merge pull request #70 from IuliiaKot/master

Pull request for issue #20

745d1c854e535efc06c49787d820fe6a737d9e2a authored about 9 years ago

update footer

067d94ee1ce98456ba48207c0ad200f9dac08391 authored about 9 years ago

Merge pull request #69 from emitche/header_adjustments

Header adjustments

a82d9ddc50e7adcda8912666fa15a9876ab74e74 authored about 9 years ago

add new page

a2ee0b52195c788fc2ada91c18df53c364350af6 authored about 9 years ago

Begin refining header media queries and styles

e39325d5af6572dad32ef0a9d03cde0edfdbd10d authored about 9 years ago

Adjust header styles

9bf11502f1d50db68e7f10085c5096d7fb5f6ac2 authored about 9 years ago

Make spacing on application title match new padding

20632e84500a7bc60b68ab55bb21e1e51734c047 authored about 9 years ago

Standardize padding of main navigation links

769978b8332e37fd9cc1b16fa99e8fd35e5ea40f authored about 9 years ago

Move header styles to separate file

73493e5c95e8479262bbb1ff999fa37c74a256ac authored about 9 years ago

Fixed groupid bug in new meetings, cleaned up empty field errors, and got rid of coffescript gem

7b6c05c02b5172204dd1f8208a24e13a67817def authored about 9 years ago

add template for error page and footer

aeb3bfe3e55e506e8b84d02a9d383d8198bfeabc authored about 9 years ago

Add a footer on error page

760d02b19ce9e4d2825937d1a338e3b482da413a authored about 9 years ago

Merge pull request #62 from julianguyen/revert-60-add-error-pages

Revert "Add error pages"

797d40da647027e9d60bbc63e72ae663ebb5a17c authored about 9 years ago

Revert "Add error pages"

785349a54292d6ace9b2a4f19f29fc2395529367 authored about 9 years ago

Merge pull request #60 from georgetoothman/add-error-pages

Add error pages

e1bfb4fd26224896fd62adab60fc122e14c8bc04 authored about 9 years ago

Get rid of inline javascript in views and moved them to assets

1965b1d45386f54f0af0d8afc82fd814597febf6 authored about 9 years ago

Quick fix for profile page class getting mixed up with profile controller class

f6b8063f3215788631d69bad0313df060b038537 authored about 9 years ago

Fixed viewers bug, datepicker bug, and cleaned up JS assets

4ffe024bac11ece97f116b487a3ea7cf5ea81605 authored about 9 years ago

Add page error

02662dcbee4a2046a363b847553e231b4452664e authored about 9 years ago

Merge branch 'master' of https://github.com/julianguyen/ifme

db9c0ce21d8a537ef63844276661cbe7a842b137 authored about 9 years ago

Merge pull request #61 from jolim24601/jl-fix-migration

Fix migration chain

fc42266e86469a78a7d5b47910b40ad842736bf4 authored about 9 years ago

Fix migration chain

At Hacker Hours to contribute to my first open source
project. Tried to migrate the db locally ...

4df51a7477a50d2cb4eea5ad1920ff4deaac936f authored about 9 years ago

add footer css

e5be769d6ba91ca0a34abff30bce1dcd4aacf757 authored about 9 years ago

add h1 formatting for error pages

9743b3c71ada16788616581aaff4b83e15f7e244 authored about 9 years ago

add fix for errors

39bbb18b25a8f63176716e17a4492a937cb13d0d authored about 9 years ago

add default errors page for non existent routes

84faa127296fd9b824b2174e5c719859d749b67f authored about 9 years ago

Upgrading to Cedar-14

62c64be048a8904d1f6eb4fa1ad7ec18df7d23ea authored about 9 years ago