Ana
cd32ddd422
_schedule hamlfy
...
_schedule changed to haml
2016-07-25 11:33:29 +02:00
Ana
818c55df5a
Tracks color in all events takes background into account.
...
It uses https://github.com/openSUSE/osem/pull/1044 to select black or white color for the track text depending on what of them contrast more with the track background.
2016-07-25 11:33:28 +02:00
Ana
70f30fcb1f
Dropdown with date tags in all events
...
Dropdown with date tags in all events of the schedule
2016-07-25 11:33:28 +02:00
Ana
cc031b9f3a
Unscheduled events added to all events
...
Unscheduled events added to all events of the schedule
2016-07-25 11:33:28 +02:00
Ana
69043e1549
All events grouped by date and time
...
The events are ordered by date and time in the all events section of the schedule. The event schdule definition in program has been changed to order the events.
2016-07-25 11:33:25 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource
2016-07-05 01:15:32 +05:30
Henne Vogelsang
8b831b1977
Merge pull request #1070 from Ana06/style
...
unnecessary %div deleted
2016-07-01 14:52:36 +02:00
Daniel Molkentin
2b43b348cd
Use relative URL when loading OSM tiles
...
This avoids mixed content warnings and gives us our
padlock back on Chromium and Firefox.
This also switches the domain for the tile servers from osm.org to
openstreetmap.org because the certificates do not mention osm.org
and hence using this domain the tiles fail to load.
2016-07-01 14:27:32 +02:00
Ana
c1ce420c5d
unnecessary %div deleted
...
unnecessary %div deleted from haml files as div is the default
2016-06-30 21:01:06 +02:00
Henne Vogelsang
ff025a4839
Fix the venue display on splash
2016-06-30 17:31:11 +02:00
Henne Vogelsang
5a0328842e
Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page
2016-06-30 13:04:28 +02:00
Ana
028d430885
Schedule height fits a 600px screen and the schedule is hiden if there is only one room
2016-06-27 18:24:47 +02:00
Ana
82c2c400b6
Swipe support added to the carousel
2016-06-27 18:16:13 +02:00
Ana
53b02d6a74
Adapting number of columns in the carousel schedule taking screen width into account
2016-06-27 18:16:13 +02:00
Ana
d8f9de9363
new schedule
2016-06-27 18:16:13 +02:00
Arun
a56b992905
Make thumbnails responsive
2016-06-22 04:36:56 +05:30
Arun
0d6a2e668c
Add fallbacks for venue commercial
2016-06-20 23:23:42 +05:30
Stella Rouzi
8a595e6284
add test
2016-06-15 20:54:51 +03:00
Stella Rouzi
2efd1bc92d
fixes
2016-06-15 18:12:46 +03:00
Stella Rouzi
70d0091fbf
XML export
2016-06-15 18:12:46 +03:00
Henne Vogelsang
949c20ac21
Limit splash navigation options
2016-05-25 13:45:48 +02:00
Christian Bruckmayer
aa925f9f75
Hide Submit proposal if iChain is enabled and user is not logged in
...
because it's not possible to create a user while submitting a proposal when iChain is enabled. User would get
not authorized error message.
2016-05-19 11:49:20 +02:00
Henne Vogelsang
1c7becb69a
use :full_conference factory in the conference view specs
2016-05-02 16:06:32 +02:00
Henne Vogelsang
0ad3ff01c3
Use PictureUploader on Lodging
2016-04-27 17:40:23 +02:00
Henne Vogelsang
40023044af
Use PictureUploader on Conference
2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f
Remove danging :photos table and other photo cruft
2016-04-27 17:40:18 +02:00
Henne Vogelsang
1fdc2f8efe
Merge pull request #946 from Shriyanshagro/venue_commercial
...
Defined Venue has_one Commercial nice new relationship
2016-04-26 14:32:54 +02:00
Aditya Prakash
d662ebd252
Remove sponsorship level from view and test
2016-04-21 21:22:14 +05:30
Shriyansh
f6b5cb03e8
redesigned view of splashpage
2016-04-21 20:21:23 +05:30
Aditya Prakash
8da80f28e2
Add pop up modal for sponsor
2016-04-21 19:51:24 +05:30
Aditya Prakash
af08d843a8
Maintain size of sponsor logos
...
Places logo on a white background if image is smaller than the given
constrains.
Resizes the logo if image is larger than constrains.
Validation of presence of logo was moved cause file field wasn't getting
marked as required field ('*' thingy) in form.
`- if logo presence` was removed cause logo is mandatory field.
2016-04-21 19:51:24 +05:30
Christian Bruckmayer
647a40be63
Prettify sponsors section
2016-04-21 19:51:24 +05:30
Shriyansh
0ca19ea67a
added views for public view on splashpage,venue_edit,venue
2016-04-10 11:57:30 +05:30
Henne Vogelsang
80f63c7263
Switch back to leaflet-rails
...
The rails-assets version has too many issues with the asset pipeline
2016-04-01 16:15:52 +02:00
CamilleM
c5da563a48
Merge branch 'master' of https://github.com/camillem/osem
2016-03-26 23:37:35 +01:00
CamilleM
d11ea33cf0
Adding .notranslate classes to haml files to have transifex better handling dynamic text. See issue #908
2016-03-26 23:32:43 +01:00
Carlos Coelho
fda08ecdb5
Added email to social media section
...
related to #764
Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-07 09:47:21 -03:00
Henne Vogelsang
33e1c6eae1
Beautify venues#show
2016-03-04 17:05:42 +01:00
Henne Vogelsang
8f42f79423
Merge pull request #769 from hennevogel/gems
...
Gems: Update MySQL2, switch assets to rails-assets.org
2016-02-18 14:03:35 +01:00
David Sedeño
28fbc518f3
Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761
2016-02-10 15:59:39 +01:00
Henne Vogelsang
09ec76a130
Switch javascript assets to rails-assets.org
2016-02-08 13:53:06 +01:00
Stella Rouzi
444356fbc7
Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels
2016-02-06 17:42:51 +01:00
David Sedeño
302d45f91a
If there are tickets for the conference, not show the msg about the free of charge. fix #745
2016-02-02 21:19:14 +01:00
David Sedeño
3095787aa7
Add title in conference show view. fix #751
2016-01-17 20:49:30 +01:00
Stella Rouzi
355ecc0ac6
Introduce strong parameters
2015-12-23 11:36:50 +02:00
Stella Rouzi
759aa54689
Syntax style + code groomming
2015-10-06 14:15:38 +03:00
raluka
1de8f979cd
Issue #649 : Wrong days remaining label when submitting a new proposal
2015-08-27 10:35:43 +02:00
Stella Rouzi
ebadb84f2f
Fix longitude latitude order
2015-06-17 22:08:18 +03:00
Björn Geuken
b685628208
Remove superflous condition
...
We ensured that the event has a track in the condition 3 lines above. Thus
we can remove this one.
2015-05-16 15:00:21 +02:00
Björn Geuken
94bb76f5ec
Haml'fy schedule_item partial
2015-05-16 15:00:17 +02:00
