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
1301 commits 19 branches 0 tags 55 MiB
Commit graph

1301 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ari Timonen
c0a7c88b8d Fix model + temp fix for view 2020-03-17 04:31:59 +02:00
Ari Timonen
a66cb599a1 JS fixes 2020-03-17 04:19:59 +02:00
Ari Timonen
04dc76b632 Fix a bug in team page 2020-03-17 04:19:34 +02:00
Ari Timonen
78a089bc86 Fix more tests 2020-03-17 03:58:33 +02:00
Ari Timonen
f2fd71bd9a Update Dockerfile for production 2020-03-17 03:36:46 +02:00
Ari Timonen
6c3c9e7770 Update pagination 2020-03-17 03:08:11 +02:00
Ari Timonen
93ab019d8c Fix more scopes and fix gather 2020-03-17 03:03:02 +02:00
Ari Timonen
00c5c86eb4 Fix icons after downgrade of FA 2020-03-17 02:13:57 +02:00
Ari Timonen
bb7df52f4c Turn of CC 2020-03-17 02:13:40 +02:00
Ari Timonen
ccf1fb8b36 Update bundler and use proper path variable 2020-03-17 02:01:59 +02:00
Ari Timonen
47c445acf4 Fix icon issue, Bump MySQL version 
downgrade style plugins
 2020-03-17 02:01:43 +02:00
Ari Timonen
fa4fbb589d Change before_filter and remove attr_protected 2020-03-17 01:57:47 +02:00
Ari Timonen
cca3a03f59 Working Gemfile for Rails 5 2020-03-16 23:59:01 +02:00
Ari Timonen
4b30fd2f71 Update production docs 2020-03-16 23:58:44 +02:00
Ari Timonen
160d29a569 Fix more scopes 2020-03-16 22:57:41 +02:00
Ari Timonen
143e364812 Fix more scopes for rails 4 + add rubocop 2020-03-16 22:46:27 +02:00
Ari Timonen
aa207ac578 Update to rails 4.2 + spring 2020-03-16 22:30:46 +02:00
Ari Timonen
fd9a6af00c Reorganize gemfile 2020-03-16 22:10:14 +02:00
Ari Timonen
a6eb8bc7b1 More work on feature tests, remove readings 2020-03-16 04:36:06 +02:00
Ari Timonen
9952bf52b5 Fix country for undefined 2020-03-16 03:12:22 +02:00
Ari Timonen
0e64bb9333 Temp. solution for movies 2020-03-16 03:08:21 +02:00
Ari Timonen
661eb61717 Update routes and rake 2020-03-16 00:58:22 +02:00
Ari Timonen
60ebd8ec7b Merge master 2020-03-16 00:19:01 +02:00
Ari Timonen
4a2b4d6c71 Fix rails4 stuff 2020-03-15 22:59:08 +02:00
Ari Timonen
322001f8d3 Rails 4 fixes 
Update to ruby 2.3.8
Update gems
Fix tests
 2020-03-15 20:31:46 +02:00
Ari Timonen
5fcf4b2a72 Update to unread gem 2020-03-15 20:31:00 +02:00
Ari Timonen
2784a6cd74 Add seperate test container and fix server tests 2020-03-15 16:55:52 +02:00
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