github.com/tosdr/edit.tosdr.org commits | Ecosyste.ms: OpenCollective

Merge pull request #73 from tosdr/enh/adding-my-points-option-menu

adding my point option to dropdown menu

bab85976afa4abcc6458a89ec59fd20b345b19e6 authored about 7 years ago by piks3l <[email protected]>

adding my point option to dropdown menu

bcfa616a3820172d5835e5fa53d1a4d7f594f318 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #72 from tosdr/make-search-form-function

fixed bug in search

718c79b090732c6fd4e62c3ebfc998983f61fff0 authored about 7 years ago by piks3l <[email protected]>

fixed bug in search

d9f63408384cefea93a2b471b6111a74c2ec5f63 authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #71 from tosdr/homepage

fix the header homepage

77dad0c3bf5fb840e57a24d2477a95a662a8fa5a authored about 7 years ago by piks3l <[email protected]>

fix the header homepage

70122bcddd1e81f6de3e39e35f7385f854dad7f5 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #70 from tosdr/homepage

fix all the cards display grid

f50478b40b63cf7942d4bc45b39d1cd7c6a37c9f authored about 7 years ago by piks3l <[email protected]>

Merge pull request #69 from tosdr/make-search-form-function

search bar is functioning for all contributions page, user's own page

db83896854122b34dabd9a1cecbd76de6959e5ce authored about 7 years ago by piks3l <[email protected]>

Fix all the cards display grid with css

8507ac404afcf8ce71cdfeb8fe74e1b255c8372b authored about 7 years ago by Ke Thien Nguyen <[email protected]>

search bar is functioning, there is a new page at route /my_points that shows only the user's contributions, no button for it yet, so have to type manually in the browser

a7792baecf51ec813edaeaa999a90269cdd2eed8 authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #68 from tosdr/fix/fix-link-navbar

[fix] link navbar + added option to login to contribution

c0644e839f271d049ecfb9bd958f2cb3dd8fbdf8 authored about 7 years ago by piks3l <[email protected]>

[fix] link navbar + added option to login to contribution

d0842139556213f7084a70e5348de3f81cd688a4 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #66 from tosdr/fix/fixed-navbar

[fix] navbar is now sticky and does not overlap body

35d05c5191dfabccf18eeff4ef2301c2eca3b1d6 authored about 7 years ago by piks3l <[email protected]>

Merge branch 'master' into fix/fixed-navbar

fb13d395cab4c7b722d70ae63f4409cde181949a authored about 7 years ago by piks3l <[email protected]>

[fix] navbar is now fixed top, no overlapping of the body

99e2da4d12c029a9ce43955775c16df2f66853d8 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #65 from tosdr/homepage

fix rating system in homepage

1829b0c593a52d785c85a0b4d7815206c27bd88e authored about 7 years ago by piks3l <[email protected]>

Merge pull request #64 from tosdr/admin-view-points-bug

fixed view bug for admins

7645c75bd899e94249d3ccb360116b5d2a504e57 authored about 7 years ago by piks3l <[email protected]>

fix rating system with the service_ratings method

7016865b8878aa0488d5f07f85fb600f8f6644a1 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge branch 'master' of github.com:tosdr/phoenix into admin-view-points-bug

63cd438705aa06f3fc64adb3132825ff46f9718f authored about 7 years ago by Madeline OLeary <[email protected]>

fixed admin vew bug

4489cbdc44f4afa790fb8508c1f70229dc6e66c5 authored about 7 years ago by Madeline OLeary <[email protected]>

adding old database, still cleaning to do

4f7e470e03b76c3f7854fe3743635bd0bf2be637 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #58 from tosdr/home-page

added a loop to the homepage code so that cards and their associated is_featured points display,...

fe3b07fb48fe6f26b2319ef11754f2c7745b73da authored about 7 years ago by piks3l <[email protected]>

Merge pull request #61 from tosdr/piks3l-patch-1

adding admin user and 2 sevrices

cf3922e6ed40c5f2d34488041eb4076623027ef0 authored about 7 years ago by piks3l <[email protected]>

adding admin user and 2 sevrices

yep 't do that

a764020be52f02a2b31460004d6ce6750cd63427 authored about 7 years ago by piks3l <[email protected]>

new seeds for production

fe7c08a91e5ad34ef1b6596ba1d14542e576471f authored about 7 years ago by Chris Talib <[email protected]>

added a loop to the homepage code so that cards and their associated is_featured points display, the more button navigates to the show page for the service. if you are a current_user, you get the list like we have in the backend, but if you are not signed in as a current user, you get a list of article-like boxes that display the title of the point and its contents. these are a work in progress, but i think they are far better than the modal. sign out to inspect. the css for these article boxes is in stylesheets/pages/components/article. fixed a couple of bugs in the feature function in points controller. needs further testing, especially on heroku. updated the point model so that its associations with the reason model are destroyed upon deletion. updated the navbar to say 'add analysis' instead of 'add point' because i think 'point' is too-broad a term and too specific to our db. updated the topics index page so that the lists display the title of the points and not the topic again. tried to style some forms, is a WIP.

924587aac9b3a57736f5364e5cad9dc9f5113c5c authored about 7 years ago by Madeline OLeary <[email protected]>

Merge branch 'master' of github.com:tosdr/phoenix into home-page

00c5cd661ba6b619f5c5ac5af9ec8b2bf6e839ad authored about 7 years ago by Madeline OLeary <[email protected]>

search bar is a work in progress

d6e41e26d7818c1d212edd4f53d5f152034d541e authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #49 from tosdr/homepage

fix rating badge for N/A rate

6f86eb875803c9daef5c03321e45368cbcf03e89 authored about 7 years ago by piks3l <[email protected]>

fix rating badge for N/A rating

b9e8b1574ed8af36df6216ba4b6707ccd8c01e4b authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #48 from tosdr/contrib-page

fix points icons for good bad neutral blocker on several pages

6b51e4005371bcc2af46014ebd739b2da0098db4 authored about 7 years ago by piks3l <[email protected]>

fix points icons for good bad neutral blocker on several page

2e55b93232c04cb94615d0f6b32a9ca0e973b387 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #47 from tosdr/contrib-page

fix margin for pages with searchbar

8b1d6f2e6653c8cf257e339c509a12f0c41c4ca4 authored about 7 years ago by piks3l <[email protected]>

Merge pull request #46 from tosdr/buttons-various-pages

flashes now working, also added necessary buttons to the corresponding pages, namely add (and de...

4a9b18b88acd710f58fdcccad485a440f51b2ea9 authored about 7 years ago by piks3l <[email protected]>

Merge branch 'master' into buttons-various-pages

32db988b0ab69e468a83fee33097ed3f07f3bb59 authored about 7 years ago by piks3l <[email protected]>

fix margin for pages with searchbar

d3a964101d5916ba21b748de606e37460a59a454 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

flashes now working, also added necessary buttons to the corresponding pages, namely add (and delete if admin) to services + service, add and delete and edit to topic if admin, delete point on point show page if admin

0ae23bbaa07295a15c791b673ea5b459615bfc33 authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #45 from tosdr/contrib-page

fix button show all in points#index

0a82258b471afe97b298be520d322c573889dcd2 authored about 7 years ago by piks3l <[email protected]>

fix button show all in point#index

cc5b05478105cd3af78d6cf3827b96f5da077ab4 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #44 from tosdr/topics-css

points#index card-inline done

e44e0f28b0c2a479fc428b0301b1d6440b8b4192 authored about 7 years ago by piks3l <[email protected]>

fix points#index card-inline

b886ea3b3fa69605dc65f57b5e206c0d7a946f19 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

saving changes to service show page and checking out of branch

e546a15601f305e3f98a1476d2596025af808640 authored about 7 years ago by Madeline OLeary <[email protected]>

saving

9e771ae36df90315ce15e7acbfca7e2acf24071d authored about 7 years ago by Chris Talib <[email protected]>

resolved conflict

23d3e859ff1bf4117186c913dc407aa7f59ad360 authored about 7 years ago by Madeline OLeary <[email protected]>

fixed feature bugs and made notes for upvote feature

46b33178c57723ecb29eae6dca2b3e272184919b authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #43 from tosdr/topics-css

fix card inline for Services and Topics

68c5ac1412782b525494c9c4a41f7547068175ea authored about 7 years ago by piks3l <[email protected]>

wip on points#index

36dc53f4451d1eef763ab9bceb71eb7ab3e443d7 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

starting to work in the import, topics work

5632c34017bf58b23efd8067bcd6d9aa928afa23 authored about 7 years ago by Chris Talib <[email protected]>

fix card-inline for services and topics

a844fe734ee6a6d432632357ebad6946e51d3af0 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

fixed bugs with feature

45aaf37f21af94142e46da6f41bbbcaa038ac076 authored about 7 years ago by Madeline OLeary <[email protected]>

change services header to like topics css

27951f0c468fcebe7ed1eb544994acd424507088 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge branches 'contrib-page' and 'master' of github.com:tosdr/phoenix into contrib-page

a081cef8efd032eb45956bbd12224f7b57e97ec1 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

better icons for points

7821a5ee74cea1a5ceae7624f9b9ca3004e49d26 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #42 from tosdr/fix/display-featured-index

fix display feature display

d956b91ec4b96c737edef2021da3e68599943120 authored about 7 years ago by piks3l <[email protected]>

[fix] fixing display features option

ec4465f11f37b24db4bf452f7be6652251598d9d authored about 7 years ago by Chris Talib <[email protected]>

saving

edbf1e1ae30637ec8bd481554583cab1f3819a3b authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #41 from tosdr/featured-points

admins can classify points as featured and can remove their featured status

21a4c6cb967a382d732fce2b2417ccb4897b3053 authored about 7 years ago by piks3l <[email protected]>

admins can classify points as featured and can remove their featured status

146cf7b480c6b35c3e8abe1fe2ad819caa6e5d2b authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #39 from tosdr/services-page

new css for the card-inline + services page

c945df839a694d98feaa6409bcc47818caa1fc6e authored about 7 years ago by piks3l <[email protected]>

new css for the card-inline + services page

a2b8d2702e4eedd8681876a7afdcf7e3b005a280 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #37 from tosdr/fix/fix-name-display

fix name display

7e8976441dd7b4970fe2c0fa3cbb9ec486de2ee5 authored about 7 years ago by piks3l <[email protected]>

Merge pull request #38 from tosdr/fix/title-in-tab

fix title in tab

bf0a9dc575278c3ce897d356c5f159cc4537ed68 authored about 7 years ago by piks3l <[email protected]>

Merge pull request #36 from tosdr/fix/showing-pages-when-not-logged-in

[fix] display option navbar for non logged in user

297c42993f96189e548d701512f4a89a0aae34fe authored about 7 years ago by piks3l <[email protected]>

[fix] fix name display

323895bf0f6cbd4834aea7cb10162fda1f7322fa authored about 7 years ago by Chris Talib <[email protected]>

[fix] fix title display

b5d6dc2807407ffa27ed64ae6341d01e8c340010 authored about 7 years ago by Chris Talib <[email protected]>

[fix] the display of the options for the navbar as a non logged in user

b2a161e4bf42c069af59457953b795138e525bb8 authored about 7 years ago by Chris Talib <[email protected]>

Updating the gemfile

b6ee0e4563f84d2ef76859ee32b756504c1cb1ac authored about 7 years ago by Chris Talib <[email protected]>

Merge branch 'master' of github.com:tosdr/phoenix into production

ef57c5c25055b8ad5ec3a09f35d6cb750a27db41 authored about 7 years ago by Chris Talib <[email protected]>

saving changes

1783506fd4c61cf5a615000edbb15bf3729fe04f authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #32 from tosdr/topic-show-page

fixed buttons on points index page so can navigate to the points show page and can go right to t...

57f7df59e2374773d442a1626fa72292a294e447 authored about 7 years ago by piks3l <[email protected]>

fixed buttons on points index page

72e0b83ba1bf4bdbef6ec62483f7eeddf71c8da9 authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #31 from tosdr/topic-show-page

progress on topics show page, as well as form for topic and edit/new pages. updated the points s...

dbc173b8740539970c5578ed5f6c06e1d8e35f18 authored about 7 years ago by piks3l <[email protected]>

progress on topics show page, as well as form for topic and edit/new pages. updated the points show page. also completed the new, edit, and form for services. also completed the index page for topics. i made a migration to rename feature in points to is_feature to avoid confusion in case a javascript function is needed so that admins can switch featured to true. also created a js file for this function, but not sure how to code it yet. please run db:migrate after pulling.

d331fa1f96e4f24c24cdbcaf016f2f46877154e2 authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #29 from tosdr/contrib-page

Working button : show all contrib

4751e1e597cc086c3d28183393de7fbd3e2f28ac authored about 7 years ago by piks3l <[email protected]>

Merge pull request #30 from tosdr/topic-show-page

did show page for individual topics, added pages for new and update, still needs index page

2626f92d9a21e323e60d280a70d2c1ce75c15e0d authored about 7 years ago by piks3l <[email protected]>

updated point show and css for show so that users can only edit their own points

56d4e4a897486c0989ff765fff1ee7e511266371 authored about 7 years ago by Madeline OLeary <[email protected]>

did show page for individual topics, added pages for new and update, still needs index page

e6670f2cdccb2ce991c27469d6072f3e88d93e1e authored about 7 years ago by Madeline OLeary <[email protected]>

Made show all button and a params all filter

cad447054b56fc0242976519b289c6401b7bc453 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #28 from tosdr/fix/navbar-buttons

fixed most navbar buttons

d6c24acb40e0d0c81421d0b713a3de09c6f8364a authored about 7 years ago by piks3l <[email protected]>

[fix] button to add point

407afb30419a23daf8a7bb2fe72d73d3c002e142 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #27 from tosdr/contrib-page

pull request for Madeline to reuse it

c7ef2a7d78b76a6079468c92e55e9320906bd263 authored about 7 years ago by piks3l <[email protected]>

mini update on the icon

205d8a4e5a19d884f1125c7fc0ee4b9690dcc2c0 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

[fix] fixed log out layout

044ab96125167a4485f0585b37ceba26bda69507 authored about 7 years ago by Chris Talib <[email protected]>

[fix] fixed buttons path

aba171ac83d4ab2ec3849b0db1d915da212609be authored about 7 years ago by Chris Talib <[email protected]>

[fix] fix dropdown navbar

da3ae1a57b64a84213b92ce553efec891d12d563 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #26 from tosdr/status-change-bug

historical changes by admin for status display on the individual point pages, had to update reas...

836203770a779b58187520518ac3197e0a72f90a authored about 7 years ago by piks3l <[email protected]>

historical changes by admin for status display on the individual point pages

0580693aa454d78474e7d09d1cb62b7a758ad91a authored about 7 years ago by Madeline OLeary <[email protected]>

Merge pull request #25 from tosdr/contrib-page

contributor page wip with header TODO: change color of status

7d8f8a994fe36ab5559fa90d7852be33b9f6bfbc authored about 7 years ago by piks3l <[email protected]>

Merge branch 'master' into contrib-page

0a85ae3c3fdf9241924de62888213f3a65173999 authored about 7 years ago by piks3l <[email protected]>

contribution page wip put a header

da6e9fd39edf9de90e9ae3bf357e66d36003f89b authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #24 from tosdr/point-view

finished individual point view, but need to fix peripheral bug with reason still; also fixed som...

de12d2767c6053a429f0504f1c094fa93617c044 authored about 7 years ago by piks3l <[email protected]>

Merge branch 'master' into point-view

cb262a37302430ff791e603306fa53bbfdaa9a2a authored about 7 years ago by piks3l <[email protected]>

Merge branch 'master' of github.com:tosdr/phoenix into contrib-page

5a60408808eb426a7c299a5ea465d77764e1edbd authored about 7 years ago by Ke Thien Nguyen <[email protected]>

finished individual point view, but need to fix peripheral bug with reason still; also fixed something in the reason model

05406677d524c8406596ddf1be6f30b70a5ca868 authored about 7 years ago by Madeline OLeary <[email protected]>

rating fixed on your contributions page and card homepage

307e8ccaf89aa5e5fc7fc66f08e7ae6e927b7718 authored about 7 years ago by Ke Thien Nguyen <[email protected]>

Merge pull request #23 from tosdr/search-feature

implemented search option for services. Careful when implementing in other page, need for settin...

019e9de65974e84334f3d7a942030ad8a1c63046 authored about 7 years ago by piks3l <[email protected]>

[fix] search field now insentive

ce9cc4f8b9cb422c4a190f77c061e2996dc5457a authored about 7 years ago by Chris Talib <[email protected]>

god this search feature works now. Need to make is case insensitive

238b83db3cda2a8069b8cae8ed8029fb5c63e596 authored about 7 years ago by Chris Talib <[email protected]>

Merge pull request #22 from tosdr/service-view

Service view

a00fb77dc4ab6e0fac5d207fc89a6e63d7f0f59e authored about 7 years ago by piks3l <[email protected]>

adding style list services

be2e97903e4038f7eef8a54e8141fc5b3af39956 authored about 7 years ago by Chris Talib <[email protected]>