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

269 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
Gopesh Tulsyan
67ea900dc3 Keynote Speakers implemented 2014-09-15 19:02:02 +05:30
James Mason
a3e4ab5ca0 there's no such thing as Array#to_h 
(cherry picked from commit 780bd84bc17f55b0ece1d86a2b224f0340495c73)
 2014-09-09 17:57:30 -07:00
Stella Rouzi
1fbbbdae6e deletions 2014-09-02 21:45:08 +03: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
Henne Vogelsang
89440b971d More accept/reject/confirm fixes 2014-09-01 17:17:30 +02: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
Stella Rouzi
30c2d66a15 remove attachments 2014-08-21 07:58:26 +03:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Stella Rouzi
3bb42bdb10 move sample user creation in seeds 2014-08-15 20:45:29 +03:00
Stella Rouzi
b5b85ede71 delete events without submitter 2014-08-15 20:45:28 +03:00
Christian Bruckmayer
63366d43a4 Merge pull request #453 from ChrisBr/bugfix_conference_controller 
Removes dulplicate conference update action
 2014-08-15 16:57:13 +02:00
Christian Bruckmayer
367c962c1b Merge pull request #429 from ChrisBr/fix_campaigns 
Fix campaigns dashboard missing method bug
 2014-08-15 16:14:31 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Christian Bruckmayer
1ab7fe3051 Merge pull request #449 from ChrisBr/introduce_speakers_relation 
Introduces speakers relation to conference #416
 2014-08-15 13:00:59 +02:00
Christian Bruckmayer
70e3d0af35 Merge pull request #448 from ChrisBr/introduce_participants_relation 
Introduces participants relation to conference #416
 2014-08-15 12:58:10 +02:00
Artem Chernikov
566382eca8 Merge pull request #441 from differentreality/cancancan 
Cancancan
 2014-08-15 12:00:35 +02:00
Stella Rouzi
bf6b09d9f4 add github for openid login 2014-08-15 06:16:42 +03:00
Chrisbr
47f524259c Introduces speakers relation to conference #416 2014-08-14 11:25:11 +02:00
Chrisbr
c7d47ce6df Introduces participants relation to conference #416 2014-08-14 10:46:02 +02:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
f5081813d9 fix from rebase 
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
 2014-08-13 22:53:14 +03:00
Stella Rouzi
f7ef401be7 style fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
d13c1a83e4 fix in questions 2014-08-13 22:53:14 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
ebdf0df410 Moving notifications to models 2014-08-12 18:34:59 +05:30
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
Gopesh Tulsyan
41fc21f7f4 Added Subscription model to send emails 2014-08-12 16:47:35 +05:30
Chrisbr
cb15ba401f Fix campaigns dashboard missing method bug 2014-08-06 18:26:07 +02:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object 
close #420
 2014-08-06 14:30:50 +02: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
4955b2b7b8 Merge pull request #414 from hennevogel/master 
Disable Style/ClassLength on Conference. It's Issue #413 now
 2014-08-01 14:29:13 +02:00
Henne Vogelsang
b5b1d093e5 Disable Style/ClassLength on Conference. It's Issue #413 now 2014-08-01 14:14:54 +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
f8784fdcd8 rubocop style fix Style/AlignParameters 2014-07-30 23:32:29 +02:00
Gopesh Tulsyan
8678b90129 Fixing emails to send them with delayed jobs 2014-07-29 00:50:39 +05:30
Gopesh Tulsyan
f5c53f77cf Email notification on cfp dates updates and schedule made public 2014-07-26 11:15:37 +05:30
Gopesh Tulsyan
8cdf48c7df Adds migrations for call for papers dates updates and schedule in email settings 2014-07-26 11:15:37 +05:30
Gopesh Tulsyan
7f6e218299 Attributes for email templates rendered conditionally, more added 2014-07-26 11:12:51 +05:30
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Chrisbr
6f3426b6a2 Implements "Add template" button for email settings 
close #16
Subjects now mandatory if send mail enabled
 2014-07-23 13:42:18 +02:00
Chrisbr
a88f7c168f [Bugfix] Implements check if mail templates not nil 
fix #286
 2014-07-23 13:42:18 +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
Gopesh Tulsyan
b2ab893d17 Merge pull request #318 from gopesht/notify_on_venue_change 
Email notification to all participants on venue update
 2014-07-22 21:37:29 +05:30
Gopesh Tulsyan
b504db3372 Added tests for emails views specs for addition of settings 2014-07-22 11:08:51 +05:30