Commit graph

767 commits

Author SHA1 Message Date
Gopesh Tulsyan
75cf1123cf Adds email template and settings for conference dates updates 2014-07-15 16:25:16 +05:30
Artem Chernikov
aee73fb442 Merge pull request #312 from differentreality/user_fields_volunteers
Add volunteer fields to user
2014-07-14 21:47:16 +02:00
Artem Chernikov
93ced1ee38 Merge pull request #314 from differentreality/attachment_default
fix attachment_default migration
2014-07-14 21:46:46 +02:00
Stella Rouzi
0f9242cbd2 fix attachment_default migration 2014-07-14 21:19:42 +03:00
Gopesh Tulsyan
6f5ab8988c Merge pull request #310 from gopesht/unused_route
Unused route for Conference#show
2014-07-14 21:35:31 +05:30
Stella Rouzi
e37e0a50c8 add volunteer fields to user 2014-07-14 17:36:58 +03:00
Gopesh Tulsyan
f7337cbb77 Unused route for Conference#show 2014-07-13 16:32:12 +05:30
James Mason
50e75c6dd4 Merge pull request #303 from gopesht/modify_date_helper
Removed conference_date_string_helper, moved date_string helper to application_controller
2014-07-10 10:00:58 -07:00
Gopesh Tulsyan
c68c6394bc Removed conference_date_string_helper, moved date_string to application_controller
Deleted home_helper.rb
2014-07-10 22:12:11 +05:30
Christian Bruckmayer
85e9fdc643 Merge pull request #296 from ChrisBr/implements_options_for_root
Implements OPTIONS http verb for root path
2014-07-08 10:55:52 +02:00
Chrisbr
61f913b727 Implements OPTIONS http verb for root path
close #294
2014-07-08 09:18:32 +02:00
Artem Chernikov
53a30439ca Merge pull request #275 from hennevogel/master
vchoices doesn't belong to conference
2014-07-07 16:24:09 +02:00
Artem Chernikov
45c4009b44 Merge pull request #295 from openSUSE/review_140704_deploy_with_mina
Add Mina configuration
2014-07-07 16:20:30 +02:00
Artem Chernikov
f58fba3f71 Rollback routes OPTIONS change [ci skip] 2014-07-07 16:10:21 +02:00
Artem Chernikov
460f763be5 Add Mina configuration 2014-07-07 16:09:07 +02:00
Henne Vogelsang
978dfd0512 vchoices doesn't belong to conference 2014-07-07 16:00:35 +02:00
Artem Chernikov
2ee621a9b2 Merge pull request #289 from openSUSE/review_140704_update_rails_and_replace_webkit_with_poltergeist
[Review] Request from 'kalabiyau' @ 'openSUSE/osem/review_140704_update_rails_and_replace_webkit_with_poltergeist'
2014-07-07 15:07:23 +02:00
Artem Chernikov
00e4b7e178 Fix typo in contributing.md [ci skip] 2014-07-07 15:06:44 +02:00
Artem Chernikov
472b05370e Add coverage improval remark [ci ckip] 2014-07-07 15:06:44 +02:00
Artem Chernikov
a3d6493ea6 Allow to collect coverage information locally 2014-07-07 15:06:44 +02:00
Artem Chernikov
8596644afa Fix migration for person to user migration 2014-07-07 15:06:44 +02:00
Artem Chernikov
ef07990e94 Hound is not more here 2014-07-07 15:06:44 +02:00
Artem Chernikov
85e8650723 Add more options to the contributur to communicate 2014-07-07 15:06:44 +02:00
Artem Chernikov
7cd21bbf11 Fix view test for cfps 2014-07-07 15:06:44 +02:00
Artem Chernikov
c482d88e3a Travis should not install ri and rdocs 2014-07-07 15:06:44 +02:00
KalabiYau
bce32255fa Cleanup current issues with schema, and regenerate latter 2014-07-07 15:06:44 +02:00
KalabiYau
78cdbf81a1 Remove AR loggin in test enviroment - speed boost hence 2014-07-07 15:06:44 +02:00
KalabiYau
ce3b733039 Drop console outputs from js 2014-07-07 15:06:44 +02:00
KalabiYau
59b83ceeb4 Drop Travises usage of xvfb 2014-07-07 15:06:43 +02:00
KalabiYau
158a9fe7a8 Add poltergeist, therubyracer, reshuffle Gemfile to be more lean 2014-07-07 15:06:43 +02:00
KalabiYau
dbb210908b Update and fix test kitchet to be conformant with poltergeist 2014-07-07 15:06:43 +02:00
KalabiYau
7f710ec72d There is no common logger in model namespace 2014-07-07 15:06:43 +02:00
Artem Chernikov
d11a889d85 Merge pull request #290 from alexvenn/readme-secrets
Add instructions for secrets on Readme
2014-07-05 23:49:28 +02:00
alexvenn
033f4c66d7 Add instructions for secrets on Readme 2014-07-05 13:07:30 +03:00
Gopesh Tulsyan
c34991db44 Merge pull request #285 from gopesht/footer
Adds button to navigate to topmost component onscroll
2014-07-04 02:30:13 +05:30
Gopesh Tulsyan
7941cac81e Adds button for navigating to topmost component onscroll
Changed color of the button to white
2014-07-03 23:58:57 +05:30
Gopesh Tulsyan
fbf52b1d69 Merge pull request #273 from gopesht/implements_markdown
Implements markdown
2014-07-03 21:01:46 +05:30
Artem Chernikov
67afcc0b19 Merge pull request #282 from openSUSE/review_140703_fix_cve_2014_3483
Fix CVE-2014-3483 - rails active record vulnerability
2014-07-03 11:57:02 +02:00
Artem Chernikov
16faf3bbe0 Merge pull request #276 from openSUSE/review_140630_rubocop_fix_1
add skipped empty lines
2014-07-03 11:20:58 +02:00
Artem Chernikov
784a92641b Fix empty lines 2014-07-03 11:20:40 +02:00
Artem Chernikov
494003892c add skipped empty lines 2014-07-03 11:18:33 +02:00
Artem Chernikov
7189221f8e Fix CVE-2014-3483 - rails active record vulnerability 2014-07-03 11:15:45 +02:00
Gopesh Tulsyan
d195d9ca70 Integrated toopay/bootstrap-markdown 2014-07-02 23:23:20 +05:30
Gopesh Tulsyan
8efcd69f3d Added hints to description fields to use markdown syntax, rendered all description fields in the splash as markdown 2014-07-02 23:23:19 +05:30
James Mason
cdd3b40f5b Merge pull request #280 from gopesht/fonts
Adding woff version of google fonts in splash
2014-07-02 09:24:56 -07:00
Gopesh Tulsyan
f6a9142510 Integration of markdown with redcarpet gem 2014-07-02 17:36:34 +05:30
Gopesh Tulsyan
49ba347e0c Adding woff version of google fonts in splash 2014-07-02 16:25:08 +05:30
Gopesh Tulsyan
0c1ed4408f Merge pull request #279 from gopesht/gallery
Implements Gallery
2014-07-02 00:59:31 +05:30
Gopesh Tulsyan
3bf54f991a Increased size of modal, added description as caption to photos 2014-07-02 00:25:09 +05:30
Gopesh Tulsyan
bea55454b2 Conditional rendering for gallery button in the splash 2014-07-01 23:54:39 +05:30