ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-27 04:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
1274 commits 19 branches 0 tags 55 MiB
Commit graph

1274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ari Timonen
bdbdef1635 Update to FactoryBot and fix admin panel spec 2020-03-15 15:33:58 +02:00
Ari Timonen
b35ba51910 More test fixes for rails 4 2020-03-15 09:53:52 +02:00
Ari Timonen
e702658d26 Backport fixes from rails4 branch 
Fix row issue in profiles, fix tests.
 2020-03-15 09:53:23 +02:00
Ari Timonen
88721b28df Fixes for development 
Temporary fix for puma.rb
Rename .env.dev
Fix more merge conflicts

Dev env runs and tests run (with fails)
 2020-03-14 21:43:19 +02:00
Ari Timonen
2c71b1147d Merge rails-4 to rails4 2020-03-14 21:10:24 +02:00
Ari Timonen
4e3009b5c2 Rails 4 updates 2020-03-09 00:07:12 +02:00
Ari Timonen
a511fb526e Fix merge conflicts 2020-03-08 22:58:52 +02:00
Ari Timonen
eff0543750 Update docker-compose 2020-03-07 21:08:37 +02:00
Ari Timonen
4402677704 Add dev dockerfiles 2019-12-08 02:20:54 +02:00
Ari Timonen
eb67122771 Add spam text for pw recovery 2019-12-08 02:20:54 +02:00
Absurdon
c56ca31e88
make sure the log folder and log file exist 2019-11-27 19:29:40 +01:00
Absurdon
c13d053bd8
have log file created in dockerfile 2019-11-27 17:57:52 +01:00
Absurdon
57859244ae
fixing spacing error in entry script 2019-11-25 15:03:35 +01:00
Absurdon
2c34da556a
Make sure the logfile exists 2019-11-25 14:11:38 +01:00
Absurdon
8dce3c8d6b
Added contributor flag to api spec 2019-11-13 00:20:18 +01:00
Absurdon
db9d4c1564
Added Contributor Group Treatment 
* Logrotation for production
* added contributors class method to Group
* added contributor? method to User
* added contributor flag to User-API
* added Contributor-Tab to staff-page
 2019-11-12 23:27:54 +01:00
Ari Timonen
8760116bef Make tests work a bit more 2019-10-22 01:57:48 +03:00
Ari Timonen
bb08000f1e Add working test 2019-10-18 02:51:40 +03:00
Ari Timonen
758dfda988 Update for rails 4 
Mostly tests
 2019-10-17 21:29:15 +03:00
Absurdon
7ec019fda6
Fixing Password Rest 
* Reverting 'forgot' view back to a form
* Adding smtp configuration for production
* Adding postfix image to docker-compose
 2019-10-14 22:26:43 +02:00
Ari Timonen
fc94c8b8e7 Add some upgrades and pending upgrade 2019-10-10 22:12:17 +03:00
Ari Timonen
d27e72b6e4 Update Dockerfile 2019-10-09 22:04:09 +03:00
Ari Timonen
11fcea3259 Add docker dev version 
Add env and docker files for development

Fix some random things related to rails upgrade
 2019-09-24 22:55:34 +03:00
Ari Timonen
82d1dc7355 Add compiling master 2019-09-07 21:47:33 +03:00
Absurdon
9c67e1fbdd
Updating some dependencies 2019-08-25 18:58:56 +02:00
Absurdon
e93588591b
Fix #131 Updating users may fail 
Issue:
When a team gets deleted team_id is not properly cleared from users who
have set the team to be deleted as their main. When now someone trys
an operation that validates the user it fails as the team_id set on that
user is not valid anymore.

Solution:
To prevent this from happening in the future update users and set
team_id to nil.

Clean up:
To clean up existing users run
UPDATE users SET team_id=NULL WHERE team_id NOT IN(SELECT id FROM
teams);
 2019-08-24 20:17:14 +02:00
Ari Timonen
23b545779d Fix a few typos in views and models 2019-08-14 09:30:56 +03:00
Ari Timonen
91a8cdca59 Partially fix gather removal bug 2019-06-07 22:47:21 +03:00
Ari Timonen
f156ed3060 More progress on upgrade 2019-06-07 11:04:16 -04:00
Ari Timonen
ce9797aed8 More progress on Rails 4.1 update 
Just fix scopes mostly.

Add binstubs.
 2019-06-03 15:38:24 -04:00
Ari Timonen
768d3faa1b Update scopes for rails 4 2019-06-02 04:26:36 +03:00
Ari Timonen
0b53968d3d Temporary commit 2019-06-01 13:56:09 +03:00
Ari Timonen
d0f0db6165 Fix gather issue 2019-05-19 18:14:29 -04:00
Ari Timonen
6122caa125 Add gather moderators 
Fix few gather issues
 2019-05-19 18:04:18 -04:00
adsfgg
cf3f5676b0 Update Discord link in staff page 2019-03-04 19:33:00 +01:00
Ari Timonen
36029b3a6f Revert "Change gather music" 
This reverts commit e8bc227821.
 2018-12-09 18:55:40 -05:00
Ari Timonen
2f1a217a00 Revert "Update gather music" 
This reverts commit 9063e3104f.
 2018-12-09 18:55:30 -05:00
Ari Timonen
9063e3104f Update gather music 
Start from 0
 2018-12-03 15:11:26 -05:00
Ari Timonen
e8bc227821 Change gather music 2018-12-03 15:03:07 -05:00
Jiriki
9a2ce76628
Merge pull request #122 from tweakign/lamefix 
Fix NS1 gather issues.
 2018-11-25 22:12:45 +00:00
Jiriki
b67c18dd90
Merge branch 'master' into lamefix 2018-11-24 23:44:05 +00:00
Ari Timonen
07c53b7469 Fix mysql2 schema issue 2018-11-22 19:46:46 -05:00
Ari Timonen
8ccef9e224 Update for rails 4 
Add matches to routes
Update mysql2 gem

Remove caldner for moment
 2018-11-22 19:46:41 -05:00
b
ee9ec74b1d Merge branch 'master' into lamefix 2018-11-15 21:21:12 +01:00
b
f6ca786c0e Update app/models/gather.rb 2018-11-15 21:16:04 +01:00
b
d5aef89bb0 add gathermod to gatherpage permissions 2018-11-15 20:59:36 +01:00
b
61e1826959 removed looping gather music, turned it down 2018-11-15 20:01:53 +01:00
adsfgg
f5ce390f97 Updated the discord link. 
The old discord link had expired, replaced with a new link.
 2018-09-23 21:02:08 +02:00
Absurdon
dec054eed8 removed shoutmsg history 
removed compmod council group from staff page
fixed some errors with missing database entries
 2018-09-21 17:30:43 +02:00
Absurdon
f695db4bb1 Fix updating of custom urls 2018-05-03 19:26:18 +02:00