Ana
2e73c3f67b
Rubocop class length increased
2016-07-11 13:46:02 +02:00
Ana
8d9bb56f06
Hexadecimal color changed to capital letters
...
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
2016-07-11 13:46:02 +02:00
Ana
0deaf1abc7
Different colors for new tracks, types and levels
...
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.
Closes https://github.com/openSUSE/osem/issues/1077
2016-07-11 13:46:01 +02:00
Stella Rouzi
798998b73f
Merge pull request #1085 from Ana06/validation
...
Name validation repeated in Track
2016-07-05 10:49:16 +02:00
Ana
9d4a82b062
Name validation repeated in Track
...
The validation to check that the name is present in track.rb is twice.
2016-07-05 10:13:41 +02:00
Henne Vogelsang
8b831b1977
Merge pull request #1070 from Ana06/style
...
unnecessary %div deleted
2016-07-01 14:52:36 +02:00
Henne Vogelsang
99d11bb3d0
Merge pull request #1073 from danimo/fix_osm_tiles_for_https
...
Use protocol relative URL when loading OSM tiles
2016-07-01 14:52:18 +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
8c27a3dbac
Merge branch 'arun1595-venue-splash-page'
2016-06-30 17:31:46 +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
4d40bb309a
Merge pull request #1059 from Ana06/api_key
...
Update API key section in TRANSLATION.md
2016-06-30 12:38:05 +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
Ana María Martínez Gómez
3db1d5f9cf
Update API key section in TRANSLATION.md
...
The API key was moved to the OSEM_TRANSIFEX_APIKEY variable in .env.development
2016-06-30 10:44:38 +02:00
Ana
1f7c903f2f
10 extra lines added to Rubocop ClassLength
2016-06-30 10:17:44 +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
Stella Rouzi
c39a4541cf
Merge pull request #989 from Ana06/registration_limit
...
registration_limit check moved to ability file
2016-06-27 20:10:24 +03: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
Stella Rouzi
0018284c66
Merge pull request #1058 from openSUSE/fix_migration
...
Remove duplicate remove_column
2016-06-27 18:10:05 +03:00
Christian Bruckmayer
8197f4267e
Remove duplicate remove_column
...
for :logo_content_type
2016-06-27 14:29:27 +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
Henne Vogelsang
3b9f18c60e
Merge pull request #1052 from nishanthvijayan/remove-unused-columns
...
Remove unused columns from Conferences,Venues,Events and Sponsors tables
2016-06-26 12:20:44 +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
Henne Vogelsang
1bbeac61e8
Merge pull request #1048 from differentreality/show_recent_conference_first
...
Show most recent conference first in conferences#index
2016-06-23 11:57:22 +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
Henne Vogelsang
c49606c815
Merge pull request #1047 from differentreality/xml_export
...
XML export fix tests. Add not nil room for scheduled events.
2016-06-22 12:33:43 +02: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
Henne Vogelsang
a9569f15d2
Merge pull request #1029 from rishabhs95/cfp-datepicker-edit
...
allow correct input dates according to its constraints while creating Call for Papers
2016-06-15 18:03:14 +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
