Commit graph

737 commits

Author SHA1 Message Date
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
Gopesh Tulsyan
81c538d82d Putting the js inside ready function 2014-07-01 22:10:29 +05:30
Gopesh Tulsyan
1244f937e6 Multiple ajax calls fixed 2014-07-01 22:02:52 +05:30
Gopesh Tulsyan
220e816155 Gallery initiated 2014-07-01 21:52:33 +05:30
Gopesh Tulsyan
ef4aed5df0 Merge pull request #271 from gopesht/fix_social_media
Fix social media
2014-07-01 21:50:05 +05:30
Gopesh Tulsyan
74535b4bd8 Adds instagram fontawesome icon to splash and reverting the description for slideshare & speakerdeck to have media ids instead of link
Adds test for instagram url to conference show
2014-07-01 21:25:22 +05:30
Gopesh Tulsyan
6ae845143e Adds instagram url to conference 2014-07-01 21:17:27 +05:30
Artem Chernikov
e576db90d7 Merge pull request #277 from differentreality/wip_registration_fix
fix in parameters
2014-07-01 11:11:48 +02:00
Stella Rouzi
d75ddcf5f3 Merge pull request #262 from differentreality/final_user_model
User/Person models merge
2014-06-30 20:08:30 +03:00
Stella Rouzi
1678c21996 fix in parameters 2014-06-30 19:15:06 +03:00
Stella Rouzi
a87018192a style fixes 2014-06-30 15:46:52 +03:00
Stella Rouzi
fc753282d3 hound fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
e8990bfb12 fix biography field as text, not string 2014-06-30 15:46:51 +03:00
Stella Rouzi
9292b79c78 houndci fixes 2014-06-30 15:46:51 +03:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Christian Bruckmayer
66b84e3660 Merge pull request #268 from ChrisBr/bugfix_db_week
[Bugfix] Conference methods related to weeks now database independent
2014-06-30 13:38:54 +02:00
James Mason
a513307ff3 Merge pull request #270 from gopesht/splash_themes
Splash themes
2014-06-26 11:08:59 -07:00
Gopesh Tulsyan
3eb0ecf994 Enhance text on location banner
Fix failing test and css fixes
2014-06-26 23:01:54 +05:30
Gopesh Tulsyan
0386a54ad3 Replaced Social icons with fontawesome icons except for speakerdeck and slideshare, css changes for other components 2014-06-26 21:28:45 +05:30
Gopesh Tulsyan
5e8239fe2b Minor edit to fonts 2014-06-26 21:28:45 +05:30
Gopesh Tulsyan
4ca7217c70 Program and Cfp theme 2014-06-26 21:28:44 +05:30
Gopesh Tulsyan
2c4101ab45 Theme intrgration initiated by Onassis theme of Blacktie.co
Banner Component designed
2014-06-26 21:28:06 +05:30
Gopesh Tulsyan
6712f582c3 Integrate font awesome 2014-06-26 21:28:06 +05:30
Gopesh Tulsyan
0a01c0c031 Merge pull request #269 from gopesht/implement_smoothscroll
Implements smoothscroll
2014-06-26 21:21:35 +05:30
Gopesh Tulsyan
9c69abe950 Implements smoothscroll 2014-06-26 20:39:46 +05:30
Gopesh Tulsyan
f7a12c977b Merge pull request #261 from gopesht/fix_align_bugs
Splash Page bug fixes
2014-06-26 20:37:44 +05:30
Gopesh Tulsyan
f6da596cc9 Count down timer alignment 2014-06-26 20:19:08 +05:30
Chrisbr
596027e49b [Bugfix] Conference methods related to weeks now database independent 2014-06-26 13:28:48 +02:00
Christian Bruckmayer
fd95570c02 Merge pull request #266 from ChrisBr/implements_ahoy
Implements targets and campaigns for conference
2014-06-26 13:21:04 +02:00
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Christian Bruckmayer
678fe38a25 Merge pull request #267 from ChrisBr/bugfix_top_submitter
[Bugfix] conference top submitter now ordered by submissions
2014-06-25 14:16:10 +02:00