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

Merge pull request #326 from tosdr/fix/276

Fix 276

ac4c87709963de60b3da0afd7e9b88340f0921a1 authored over 6 years ago by Christopher Talib <[email protected]>

[mod] removing justified text for cards

06dd892b9049cde563a7c434ce4345676af2fe52 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #325 from tosdr/production

Rebasing

2774ea5483dbdf20ca9bd2022110552bb05d7d45 authored over 6 years ago by Christopher Talib <[email protected]>

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

b14294483c6094e20938eb8cdf428aae52d97f7f authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #324 from tosdr/fix/262

[enh] adding notice after deletion of point

66bde54d2b5910fc2252bef0abd9cb1575bee493 authored over 6 years ago by Christopher Talib <[email protected]>

[enh] adding notice after deletion of point

767539445ac262857d2478f570aef245396cc0f6 authored over 6 years ago by Chris Talib <[email protected]>

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

0bf3673d21360f7523794a19151f9f168b4877f2 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #323 from tosdr/fix/262

Fixing issue 262

7d2602fe646fb89ab4d3e494e3bf57a5699e2357 authored over 6 years ago by Christopher Talib <[email protected]>

Fixing the impossibility to delete points due to comments

bdd8a51ff78a502258bf74723b9ddf3c6ce25b2b authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #322 from tosdr/mj-import-missing-services

import missing services in production

d95b6dafaf01815864a33f59e2d6cc0e6acc8a94 authored over 6 years ago by Michiel de Jong <[email protected]>

services that are missing in production

1b66e62857e86ed76608e1e9a2a5216dd0423905 authored over 6 years ago by Michiel de Jong <[email protected]>

import missing services in production

2bd43777fa0e8a28bd74141e4dae0dc81749fe7f authored over 6 years ago by Michiel de Jong <[email protected]>

Merge pull request #321 from tosdr/fix/320

fix for issue 320, unauthorized access was too strong

75dd44c6e95bdee421ba527f1df6aa1156b0dc32 authored over 6 years ago by Christopher Talib <[email protected]>

preventing from not curator users to edit points, not the best but it's a quickfix

ccba58d72252aa9cd083913c7f05bb5848d7f6fd authored over 6 years ago by Chris Talib <[email protected]>

fix for issue 320, unauthorized access was too strong

722399e3541320ee88dc2eac7880029f2c208fb8 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #319 from tosdr/revert-318-fix/500-on-versions

Revert "Reverting previous changes"

af2f3409ee71b234d2007108afe0fe0a8ed5389f authored over 6 years ago by Christopher Talib <[email protected]>

Revert "Reverting previous changes"

0ca161157459ddf94e41f6464a322227ef603b79 authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #318 from tosdr/fix/500-on-versions

Reverting previous changes

ab3fb0a7133267233c888f564ef316f21130a86e authored over 6 years ago by Christopher Talib <[email protected]>

reverting previous changes

a956425f781bb456e25c843c549b9b96ffe89d3f authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #316 from tosdr/201805-handling-nil-versions

exception for handling points with no versions

bbf10d552e342acb01192b10d66570819070a91c authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #317 from tosdr/fix/500-on-versions

fix 500 on versions on certain points #4

c22063ccf12178e9fa0353c35d8654a4313cecf7 authored over 6 years ago by Christopher Talib <[email protected]>

missing method for a good formatting, ugly fix

c0b4a7902fe1ed2d00f8b07cd51f079bf09be565 authored over 6 years ago by Chris Talib <[email protected]>

exception for handling points with no versions

a90dd8ddc368320ea4d4e6230289114a409344c3 authored over 6 years ago by Madeline OLeary <[email protected]>

Merge pull request #315 from tosdr/fix/500-on-versions

fix 500 on versions on certain points #3

236fddeda04a250a7a8499c82cf577327394fb61 authored over 6 years ago by Christopher Talib <[email protected]>

fixing the output of the other time

a4b696482e2287735d3309b3fefe33164e83bd5a authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #314 from tosdr/fix/500-on-versions

fix 500 on versions on certain points #2

8c599028c4f08c162197875ffa72468797974e58 authored over 6 years ago by Christopher Talib <[email protected]>

maybe this would work

06d6349014bae094ed17862712680b781fb05fa9 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #313 from tosdr/fix/500-on-versions

fix 500 on versions on certain points

dbfac130ed7a2c59fadb759fef4607b93a65ff71 authored over 6 years ago by Christopher Talib <[email protected]>

trying out another fix

6f0a02b335b000954dd06cb1bd5fa72e1f4c55d6 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #311 from tosdr/revert-310-fix/500-on-versions

Revert "quickfix for points that have nil versions"

8b7882f4c192e1a68210241e3885806f0f3a82ea authored over 6 years ago by Christopher Talib <[email protected]>

Revert "quickfix for points that have nil versions"

b7ba87eba8bdabbd693d2ef55434a09c6ed08b45 authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #310 from tosdr/fix/500-on-versions

quickfix for points that have nil versions

42d4d2db8ad471eeb50910a77192f3abd25eb950 authored over 6 years ago by Christopher Talib <[email protected]>

missing end

d11edaabfcb855d006cb785c34903427ee9fef25 authored over 6 years ago by Chris Talib <[email protected]>

quickfix for points that have nil versions

ae4eaf83bb44bdafdc88028d5fbde1f81f0272d0 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #252 from tosdr/mj-points-db-sync

points db sync

7795947bba2e86acc5fbce2a4b2eccf7376d31f3 authored over 6 years ago by Michiel de Jong <[email protected]>

warn about database dumps

fae0c83343e8945a3f6f2a74f6cd59fdb5e9cb24 authored over 6 years ago by Michiel de Jong <[email protected]>

readme and remove live- from point filenames

b4a899ee37b7eca3a203ff3b1b015c92a8e4173e authored over 6 years ago by Michiel de Jong <[email protected]>

remove old_db in favor of ../tosdr-build

91ee8613d23c37ca9ac5ab635bfcdec79ba3e341 authored over 6 years ago by Michiel de Jong <[email protected]>

im-/export straight from/to tosdr-build

5a5264901006fef54024c6aef37bec1f41e420ca authored over 6 years ago by Michiel de Jong <[email protected]>

Merge pull request #295 from tosdr/four-choices-points

Four choices rating

0a3d38bd3697d09bfec97373f5ee61bb21de4448 authored over 6 years ago by Christopher Talib <[email protected]>

forget about the inline so far

8663467008ea118e4dafb364d0b3d82fc76ffbb7 authored over 6 years ago by Chris Talib <[email protected]>

correcting the size of the columns

be7ce9fabf3453fc6902a1e158c9ecff7feb2941 authored over 6 years ago by Chris Talib <[email protected]>

putting things in inline

5733bf3cc74de78147a5f18fbe8063ffded23925 authored over 6 years ago by Chris Talib <[email protected]>

Merge branch 'four-choices-points' of github.com:tosdr/phoenix into four-choices-points

5988a11ae56144048e67ba04acafd1d27fa462e3 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #305 from tosdr/fix/500-show-point

Quick fix for the view

d09e5a9cad197f9600b9998195744f5cc5670570 authored over 6 years ago by Christopher Talib <[email protected]>

quick fix for view

5c3d95493d2d8e86743a4c99c7f0459d8d8038a2 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #304 from tosdr/fix/500-show-point

Fix/500 show point

edcaa2d4fa3576d9fcfa7b1d3d5747422f465b98 authored over 6 years ago by Christopher Talib <[email protected]>

pushing with a clean schema

105664ca82f3f1fef07c67ff903621041bcbda12 authored over 6 years ago by Chris Talib <[email protected]>

merging

2692c05ea924a23dbeede3acea9b6c179af470cb authored over 6 years ago by Chris Talib <[email protected]>

merging

48a610715e4f8e655ae492437fadd642d9adb558 authored over 6 years ago by Chris Talib <[email protected]>

renaming remigrating

2cdc0be88da6ea4b3b799d858ffd5472f76ee898 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #303 from tosdr/fix/20180501-500-reason

Rolling back migration

245e9f36519e1203d36664a0272b5e563708a2d7 authored over 6 years ago by Christopher Talib <[email protected]>

rolling back migration

23f96665591d2b5a0a14661bf3d7270b0d6581dc authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #302 from tosdr/fix/20180501-500-reason

dirty fix for the missing method in production

f62c63b964f4290fdba8386c8d37638226758c54 authored over 6 years ago by Christopher Talib <[email protected]>

dirty fix

de0de4c1c343ae7813ab624f1437e0a1d65dea6c authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #300 from tosdr/fix/20180501-500-reason

Fix/20180501 500 reason

0bccd2cfe758737f49b4f1451c09aa05a77a4bcb authored over 6 years ago by Christopher Talib <[email protected]>

putting the rigth part where it belongs to

bb7cb605c56e2123b1aab08174741884f2a3fc95 authored over 6 years ago by Chris Talib <[email protected]>

running migration

e89cfaedf525c5a204ea782063dbc0ed3f649dc0 authored over 6 years ago by Chris Talib <[email protected]>

removing the removal of change reason

9efa15d18e8a124807a1806f87beb6ed927b334c authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #299 from tosdr/revert-298-fix/500-show-point

Revert "Fix show point in production"

d3e1d133c5dbbb4da877e181036ceb480fdf18b2 authored over 6 years ago by Christopher Talib <[email protected]>

Revert "Fix show point in production"

349b7aff5f71685349d442ab8fe5199ad1920da5 authored over 6 years ago by Christopher Talib <[email protected]>

[fix] hotfix with duplicate migrations

ca2bc7846abefcf8b0ce0aa13737a8135869f5d7 authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #298 from tosdr/fix/500-show-point

Fix show point in production

b543740e79b1cca8d0141034265ab2d89a82e3cc authored over 6 years ago by Christopher Talib <[email protected]>

changing view

f223a417f28fe08ee34d4cc0328ed7325ed3af3e authored over 6 years ago by Chris Talib <[email protected]>

creating migration

2e94ca4863008d9d94ec37ca349ba8f7af54224a authored over 6 years ago by Chris Talib <[email protected]>

[enh] duplicate code

c0e8e4a7316d1c2ec36ee4a21e01b63f7d7a149a authored over 6 years ago by Chris Talib <[email protected]>

trying some stuff, maybe found where the error is

9150f93bca28a2659536f487abbb0dd2d7c7a564 authored over 6 years ago by Chris Talib <[email protected]>

trying to set up reason before editing

1909642ef74997cc44527d3b872b494ada275cdd authored over 6 years ago by Chris Talib <[email protected]>

adding some hints

a9561ac637f558de6bfa2905c1a7be095f95bfdd authored over 6 years ago by Chris Talib <[email protected]>

implementing a radio button choice in the submission process of points

f38fbbdcf1f6e10da32d7ba09226ef8098ebf73c authored over 6 years ago by Chris Talib <[email protected]>

removing legacy code

26337cda9dc78fdf000944ac121696fa3a2c979b authored over 6 years ago by Chris Talib <[email protected]>

Merge pull request #294 from tosdr/201804-featured-bug

corrected put method in routes to fix is_featured bug

61fe8559d65533bc66cce459b8c47b31eba25563 authored over 6 years ago by Madeline OLeary <[email protected]>

corrected put method in routes to fix is_featured bug

c2a5e6827760f70fe37653ae3dd6bf16b9221ecb authored over 6 years ago by Madeline OLeary <[email protected]>

Update README.md

8e6033936fa5d2bb288185fb30e8e1808a708e17 authored over 6 years ago by Christopher Talib <[email protected]>

Update CONTRIBUTING.md

10e9f3c5c626b5c40c6a640d9e918523ec9a5047 authored over 6 years ago by Christopher Talib <[email protected]>

Update README.md

adding maintainers documentation

4078b7c8819b13a27a3267a8fef3fc48db54f40b authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #291 from tosdr/201804-reason-on-point-update

added 'reason' form input to point edit page

c49198505fc67d91ebdc3e6ec2d7e64b1cc20486 authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #292 from tosdr/201804-cleaning-css-files

cleaned the css files and got rid of stuff we aren't currently using …

0a96c8cbe9759f05e63f019c224f9b70b709bb8b authored over 6 years ago by Christopher Talib <[email protected]>

added 'reason' form input to point edit page

440f6df8becd8c30f925ac7b06a1512e0b3d0c0f authored over 6 years ago by Madeline OLeary <[email protected]>

Merge pull request #257 from tosdr/enh/strong_password_policy

[WIP] [enh] Stronger password policy

55f0bb0abdb4e8353db4df48e5aaa11040267f88 authored over 6 years ago by Christopher Talib <[email protected]>

cannot log in directly after password reset

1b8dbfaff6ca053fff9c7b10cc2ce0f72c31aad5 authored over 6 years ago by Chris Talib <[email protected]>

adding test for one digit, one cap and one number

f8743ceaf612a256e56732474719412297a78ea6 authored over 6 years ago by Chris Talib <[email protected]>

password length from 8 chars instead of 6

778b70e097dc16652b19b638565a3141dad39005 authored over 6 years ago by Chris Talib <[email protected]>

adding locking startegy on time with 1h delay after 20 tries

190a9f977538e4a6b4c642f8c14ec4cde721e191 authored over 6 years ago by Chris Talib <[email protected]>

[sec] locking account after 20 tries

a7e27f16e9ba20ceff3f50b759bf0a12d705713c authored over 6 years ago by Chris Talib <[email protected]>

cleaned the css files and got rid of stuff we aren't currently using in the app

c8d603d1017bce95e87e871ec56b793ffaab05ff authored over 6 years ago by Madeline OLeary <[email protected]>

Merge pull request #289 from tosdr/sec/access-modification

[sec] adding a test for curator status

e21e1ac8d70256e282af77a145239b77ba98d978 authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #283 from tosdr/versions-formatting-ux

Versions formatting ux

798e78d2e059bb4a96725c621d80b3c91489b957 authored over 6 years ago by Christopher Talib <[email protected]>

putting the curator test in all the relevant controllers

540ad49994d353d531cdc4e43a7bf93168e6892b authored over 6 years ago by Chris Talib <[email protected]>

[fix] adding a 401 page and a new method in service controller to controll access to curators only

4e79fcd8e159e8e2c228ba9f45df65a3ee0aaa40 authored over 6 years ago by Chris Talib <[email protected]>

[mod] allowing to show the button only for curators

a920675999f1c66f7901bbfb7a8443710cc4e75a authored over 6 years ago by Chris Talib <[email protected]>

[fix] there was a css class missing

30cbef818af46e41a12592f9b9eac110eea1123f authored over 6 years ago by Chris Talib <[email protected]>

Migrating, changing the display of the analysis to a background white

387cec77efc5709c64a2363f7a1669f82fe312e7 authored over 6 years ago by Chris Talib <[email protected]>

Merge branch 'master' into versions-formatting-ux

2398ae1e105f39171335b5119053884b2f67a75d authored over 6 years ago by Christopher Talib <[email protected]>

Merge pull request #288 from tosdr/fix-featured-routes

fixed routing for featured points

86f8549bc4fffe38cef967dd3ebe2b22deec6ee2 authored over 6 years ago by Christopher Talib <[email protected]>

[fix] fixing the call to the wrong variable

9e7890d8578ccdc3762723de52b1339dc3ac6c17 authored over 6 years ago by Christopher Talib <[email protected]>

fixed routing for featured points

c088d2a455b95a4866c8fef08ca236c79220893b authored over 6 years ago by Madeline OLeary <[email protected]>

Merge pull request #287 from tosdr/prod-fixes

[fix & mod] Prod fixes

a5118fd7daa033a81805f0e6a21002d790a82835 authored over 6 years ago by Christopher Talib <[email protected]>

[mod] Changed typo to modern ruby writing

758324561f4cca81b438e2cff40924870b495e02 authored over 6 years ago by Chris Talib <[email protected]>

[fix] 1) button on the show point page was leading to a blank page (not displayed) for current_user.nil? Fixed by making the button disapeared. Also reworked the button on show point page for our 3 type of users (nil, user, curator) as the display was inconsistent. Some minor typos as well

0501e3916c2ebef7a81007ef835a9e9968df64ac authored over 6 years ago by Chris Talib <[email protected]>