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
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
Henne Vogelsang
cdaefee323
Merge pull request #1065 from shyukri/scheduling_default_timezone
...
Scheduling new conference: use default Time.zone.now instead of the 1…
2016-06-30 12:43:47 +02:00
Henne Vogelsang
5d5ad9348c
Merge pull request #1034 from Ana06/statistic
...
Statistics
2016-06-30 12:25:59 +02:00
Henne Vogelsang
92e9043a57
Merge pull request #1030 from Ana06/public-schedule
...
New schedule
2016-06-30 12:13:51 +02:00
Shyukri Shyukriev
118f8f416d
Scheduling new conference: use default Time.zone.now instead of the 1st available option which was American Samoa. Should fix issue#1064.
2016-06-29 12:38:27 +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
Ana
866e58b5bf
registration_limit check moved to ability file
2016-06-27 18:11:21 +02:00
Henne Vogelsang
69a0d12793
Merge pull request #1044 from Ana06/tracks-color
...
Changing the text color of tracks taking the background color into account
2016-06-26 12:34:10 +02:00
Ana
460d117d7a
making next_color function more readable
2016-06-25 15:36:43 +02:00
Ana
1d7f3207a6
Registrations dashbox eliminated from registrations
2016-06-25 15:36:33 +02:00
Ana
62c3ee1631
Statistics on top of Registrations#index
2016-06-25 14:39:45 +02:00
Ana
f5701f2e77
Statistics on top of Events#index
2016-06-25 14:39:45 +02:00
Nishanth Vijayan
7a7a58ebf8
Remove unused columns from Conferences,Venues,Events and Sponsors tables
2016-06-25 00:27:25 +05:30
Henne Vogelsang
f5e52e3855
Merge pull request #1051 from differentreality/xml_sort
...
Order events by date for XML export
2016-06-23 11:57:52 +02:00
Stella Rouzi
b0ffa683dc
Show most recent conference first in conferences#index
2016-06-23 12:25:39 +03:00
Stella Rouzi
c1205c6387
Order events by date
2016-06-22 16:09:17 +03:00
Arun
a56b992905
Make thumbnails responsive
2016-06-22 04:36:56 +05:30
Stella Rouzi
15076b11f1
XML export fix tests. Add not nil room for scheduled events.
2016-06-20 21:05:08 +03:00
Arun
0d6a2e668c
Add fallbacks for venue commercial
2016-06-20 23:23:42 +05:30
Ana
1846eebea3
Changing the text color of tracks
2016-06-20 17:09:39 +02:00
Henne Vogelsang
b1b8703753
Merge pull request #1038 from differentreality/xml_export
...
XML export
2016-06-20 15:01:12 +02:00
Stella Rouzi
8a595e6284
add test
2016-06-15 20:54:51 +03:00
Henne Vogelsang
139a8565e2
Merge pull request #1041 from differentreality/laguanges_list
...
Add languages_list in controller admin/events#edit
2016-06-15 18:04:02 +02:00
Stella Rouzi
3b9e4772ee
Add languages_list in controller admin/events#edit
2016-06-15 18:34:39 +03:00
Rishabh Saxena
c802bd95b9
change datepicker id to place correct constraints
2016-06-15 20:48:55 +05:30
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
dcae196d2b
Merge pull request #905 from Ana06/languages
...
Languages
2016-06-15 16:55:12 +02:00
Ana
6c87995050
Configure language of events
2016-06-03 14:09:37 +02:00
Henne Vogelsang
be4198eb37
Merge pull request #1024 from Ana06/event-length
...
Limit event types length
2016-06-02 15:46:45 +02:00
Henne Vogelsang
2cc37290bc
Merge pull request #1026 from ChrisBr/csv_export
...
Implements csv export of registrations
2016-06-02 15:46:17 +02:00
Christian Bruckmayer
0de4813c27
Implements csv export of registrations
...
close #1021
2016-06-02 15:22:21 +02:00
Ana
55c41810b2
Limit event types lenght
2016-05-31 16:51:12 +02:00
Henne Vogelsang
7d77495936
Hotfix question display
...
what a mess....
2016-05-25 14:40:45 +02:00
Henne Vogelsang
949c20ac21
Limit splash navigation options
2016-05-25 13:45:48 +02:00
Henne Vogelsang
d6a8680d5d
Merge pull request #1008 from nishanthvijayan/remove-unused-helpers
...
Remove unused helper methods
2016-05-23 11:52:22 +02:00
Nishanth Vijayan
6eda97e10c
Remove unused helper methods
2016-05-21 01:00:46 +05:30
Nishanth Vijayan
e83b2c3a90
Display sponsor pages only if sponsorship levels are defined
2016-05-19 19:11:38 +05:30
Henne Vogelsang
02487be6fb
Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings
...
Fix deprecation warnings
2016-05-19 14:37:39 +02:00
Henne Vogelsang
81ddb76c24
Merge pull request #994 from differentreality/allow_nil_max_attendees
...
allow max_attendees to be nil
2016-05-19 12:03:43 +02:00
Henne Vogelsang
6a127a29a3
Merge pull request #1001 from ChrisBr/ability
...
Fixes ability
2016-05-19 12:01:31 +02:00
Henne Vogelsang
afbffbf2b1
Merge pull request #1004 from ChrisBr/proposal_show
...
Make proposal show view more robust
2016-05-19 12:00:23 +02:00
Henne Vogelsang
20be0f58ba
Merge pull request #1005 from ChrisBr/ichain
...
Hide Submit proposal if iChain is enabled and user is not logged in
2016-05-19 12:00:10 +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
Christian Bruckmayer
406e37a1d8
Adapt ability to allow proposal creation if cfp is open
...
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00