Commit graph

594 commits

Author SHA1 Message Date
Stella Rouzi
e6ddb910d6 fix style 2014-08-13 22:53:13 +03:00
Stella Rouzi
58a63d9fd0 fix style 2014-08-13 22:53:13 +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
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
Gopesh Tulsyan
fe17bd26e5 Merge pull request #440 from gopesht/add_home_route_to_splash
Added route to root path for navigation from splash
2014-08-13 09:20:56 +05:30
Gopesh Tulsyan
ebdf0df410 Moving notifications to models 2014-08-12 18:34:59 +05:30
Gopesh Tulsyan
4809edffe4 Removed brand helper for consistency, replaced glyphicons with fontawesome icons 2014-08-12 17:04:16 +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
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
Gopesh Tulsyan
ddfe8e5227 Fix splash layouts, other ui fixes 2014-08-07 16:34:22 +05:30
Stella Rouzi
e06e0a5ca3 more style fixes 2014-08-07 07:42:22 +03:00
Stella Rouzi
1c1391c69e enable style ClassAndModuleChildren 2014-08-06 21:26:08 +03: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
Gopesh Tulsyan
23c68211f0 Redirect to root path if splash is not public 2014-08-04 18:49:45 +05:30
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
Gopesh Tulsyan
021b118c5c Merge pull request #406 from gopesht/fix_user_creation
Adds new method to admin/users controller
2014-08-01 17:19:11 +05:30
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
Gopesh Tulsyan
9dd866f17d Adds 'new' method to admin/users controller, to render new user template, fixes #380 2014-08-01 14:35:25 +05:30
Henne Vogelsang
e9bf2f8399 Style the general dashboard icons 2014-08-01 10:12:04 +02:00
Artem Chernikov
eb127b4f8c Add new styles to be checked 2014-07-30 23:43:00 +02:00
Artem Chernikov
6e7e0c2cd3 Style/BracesAroundHashParameters enabled 2014-07-30 23:37:50 +02:00
Artem Chernikov
4aa1f0bf3a rubocop Style/AndOr style enabled 2014-07-30 23:34:09 +02:00
Artem Chernikov
f8784fdcd8 rubocop style fix Style/AlignParameters 2014-07-30 23:32:29 +02:00
Chrisbr
1c5e876364 [Bugfix] Dashboard line charts fixed 2014-07-30 15:56:34 +02:00
Gopesh Tulsyan
8678b90129 Fixing emails to send them with delayed jobs 2014-07-29 00:50:39 +05:30
Gopesh Tulsyan
993f818073 Merge pull request #340 from gopesht/fix#232
Navigation fixed, able to navigate to root_path from any page.
2014-07-28 21:31:46 +05:30
Gopesh Tulsyan
4a552c9623 Merge pull request #338 from gopesht/notify_on_cfp_update
Notify on cfp update
2014-07-28 21:31:02 +05:30
Gopesh Tulsyan
e845d79b71 Merge pull request #369 from gopesht/fix_email_templates
Attributes for email templates rendered conditionally, more added
2014-07-28 18:39:01 +05:30
Stella Rouzi
021f9fecf8 programm -> program 2014-07-27 15:53:19 +03:00
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
Stella Rouzi
5e293e5547 typo 2014-07-24 23:30:28 +03:00
Stella Rouzi
2830256ebb Merge pull request #313 from differentreality/questions_fix
Questions fix
2014-07-24 21:00:21 +03:00
Henne Vogelsang
2dea55069d Merge pull request #356 from hennevogel/proposals
Refactored proposal. Enabled cancancan
2014-07-23 17:56:32 +02:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Christian Bruckmayer
3e5a089eb1 Merge pull request #367 from ChrisBr/fix_js_error
Enables poltergeist and fixes js error on dashboard
2014-07-23 16:16:56 +02:00
Chrisbr
5e9cc49ef4 Fix Javascript error on dashboard
close #354
2014-07-23 16:06:37 +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
2254c2e359 [Bugfix] Added missing namespace for TransitionsException 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
Chrisbr
424bf19a91 [Bugfix] Admin event states controller
#286
fix #287
2014-07-23 13:42:17 +02:00