gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2882 commits 2 branches 2 tags 50 MiB
Commit graph

294 commits

Author SHA1 Message Date
chrisbr
15c6ed127f Implements username authentication 
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
 2014-11-03 15:25:33 +01:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Stella Rouzi
f91467a00a remove trailing spaces and blank lines 2014-09-02 21:41:25 +03:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference 
#418
 2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
Henne Vogelsang
f212aeeb30 Add a rake task to the deployment to backup the DB. 
Apparently needed with all the broken migrations...
 2014-08-20 00:49:48 +02:00
Henne Vogelsang
f2bbb68ad9 Update rails to address CVE-2014-3514. Fix the deployment 2014-08-19 12:31:31 +02:00
Artem Chernikov
65291d8b0d Merge pull request #450 from gopesht/dj_deploy 
Adds delayed jobs recipe for production, and some documentation
 2014-08-19 09:50:36 +02:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Gopesh Tulsyan
98112b5a03 Adds delayed jobs recipe for production, and some documentation added for running delayed jobs in local 2014-08-15 22:13:07 +05:30
Henne Vogelsang
71bf793cdf Merge pull request #451 from hennevogel/master 
Fix email from config variable. Fixes #446
 2014-08-15 14:12:21 +02:00
Artem Chernikov
566382eca8 Merge pull request #441 from differentreality/cancancan 
Cancancan
 2014-08-15 12:00:35 +02:00
Henne Vogelsang
63cf8e784a Fix email from config variable. Fixes #446 2014-08-15 11:58:47 +02:00
Stella Rouzi
b1c65eea79 style fix 2014-08-15 06:16:42 +03:00
Stella Rouzi
035988a2e1 remove keys 2014-08-15 06:16:42 +03:00
Stella Rouzi
bf6b09d9f4 add github for openid login 2014-08-15 06:16:42 +03:00
Stella Rouzi
c8e741d0ca openID keys for localhost in example secrets, so that openID works out of the box 2014-08-15 06:16:42 +03:00
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
c9d608175b fix from rebase 2014-08-13 22:53:14 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Henne Vogelsang
6755328c4c Merge pull request #443 from hennevogel/master 
Switch to apache init restart
 2014-08-13 11:41:28 +02:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts 
Add email settings to user accounts
 2014-08-13 09:22:34 +05:30
Henne Vogelsang
6e2efa502b Switch to apache init restart as passenger's tmp/restart.txt seem not to be reliable :-/ 2014-08-12 18:43:46 +02:00
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
Chrisbr
22cc5e4f14 Extracting Photos form Conference edit form 
close #384
 2014-08-12 08:38:51 +02:00
Chrisbr
a8b94c13f3 Refactoring Conference Basics #384 2014-08-12 08:32:45 +02:00
Artem Chernikov
ac25561523 Merge pull request #432 from differentreality/style_module 
enable style ClassAndModuleChildren
 2014-08-11 10:26:23 +02:00
Artem Chernikov
0fe8c76c9b Remove syck, add notifier back, add cleanup on deploy 2014-08-07 10:30:34 +02:00
Stella Rouzi
e06e0a5ca3 more style fixes 2014-08-07 07:42:22 +03:00
Henne Vogelsang
2f814c7320 Disable :notify_errbit in deploy. Issue #431 2014-08-06 20:48:56 +02:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object 
close #420
 2014-08-06 14:30:50 +02:00
Henne Vogelsang
850beb72e1 Merge pull request #409 from hennevogel/refactor-conference-contact 
Refactor conference contact
 2014-08-06 11:56:14 +02:00
Stella Rouzi
a8379081b4 enable openids in development by default, do not show openID header unless keys are set. 2014-08-01 16:49:05 +03:00
Henne Vogelsang
5aa0d58c57 Move Conference contact details to Contact 2014-08-01 14:30:10 +02:00
Henne Vogelsang
eb3e6898d2 Implements Contacts 2014-08-01 14:30:10 +02:00
Henne Vogelsang
5f96c276e9 Rework the Sign Up/Sign In views 
Use Capybaras save_page when feature tests go wrong
 2014-08-01 13:35:06 +02:00
Artem Chernikov
6e7e0c2cd3 Style/BracesAroundHashParameters enabled 2014-07-30 23:37:50 +02:00
Stella Rouzi
4184396ca7 user omniauth with mock credentials in development 2014-07-25 18:48:04 +03:00
Artem Chernikov
5870838fc1 Merge pull request #366 from hennevogel/errbit-filter 
Ignore more exceptions. Fixes #351
 2014-07-24 17:37:03 +02:00
Gopesh Tulsyan
f1f0f16d5c Merge pull request #355 from gopesht/email_processing_in_background 
Delayed job integration done
 2014-07-23 23:45:15 +05:30
Gopesh Tulsyan
c282f6c14e Delayed job integration done 2014-07-23 21:29:55 +05:30
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Henne Vogelsang
8112492a4b Ignore more exceptions. Fixes #351 2014-07-23 15:52:14 +02:00
Christian Bruckmayer
35c5116051 Merge pull request #347 from ChrisBr/fix_test_dates 
Implements timecop to make tests independent from DateTime
 2014-07-23 15:20:44 +02:00
Artem Chernikov
d9d72eae07 Merge pull request #349 from openSUSE/review_140721_basic_rubocop_rules 
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140721_basic_rubocop_rules'
 2014-07-23 11:00:30 +02:00
Chrisbr
7c51d1a42f Implements timecop to make tests independent from DateTime (close #327) 2014-07-23 10:28:15 +02:00
Artem Chernikov
9a3451af4f Merge pull request #311 from differentreality/openid 
Only show openid options if providers are set in User model.
 2014-07-22 23:30:12 +02:00
Artem Chernikov
5289f41eb5 Use only new hash syntax 2014-07-21 15:05:58 +02:00