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
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
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
Stella Rouzi
15076b11f1
XML export fix tests. Add not nil room for scheduled events.
2016-06-20 21:05:08 +03:00
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
Stella Rouzi
70d0091fbf
XML export
2016-06-15 18:12:46 +03:00
Henne Vogelsang
0d6199058f
Merge pull request #1037 from rishabhs95/hakiri-nokogiri
...
update nokogiri gem for hakiri issue
2016-06-15 16:55:51 +02:00
Henne Vogelsang
dcae196d2b
Merge pull request #905 from Ana06/languages
...
Languages
2016-06-15 16:55:12 +02:00
Rishabh Saxena
38080c7660
update nokogiri gem
2016-06-13 19:02:36 +05:30
Henne Vogelsang
1cc2b0cac2
Add heroku button to README.md
2016-06-08 14:55:12 +02:00
Henne Vogelsang
5b773197f3
Update INSTALL.md
2016-06-08 14:47:50 +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
74e889a046
length test in EventType fixed
2016-06-01 13:09:45 +02:00
Ana
55c41810b2
Limit event types lenght
2016-05-31 16:51:12 +02:00
Stella Rouzi
301ad1c722
Merge pull request #1015 from Ana06/wrong-test
...
Wrong test: proposal cannot be rated
2016-05-28 23:58:18 +03:00
Stella Rouzi
e94b766bea
Merge pull request #1014 from nishanthvijayan/remove-dead-routes
...
Remove routes of Speakers,People and Photos controllers
2016-05-28 23:56:46 +03:00
Ana
f648b8731a
Wrong test: proposal cannot be rated
2016-05-27 00:45:42 +02:00
Nishanth Vijayan
740c57f0ad
Remove routes of Speakers,People and Photos controllers
2016-05-27 01:22:41 +05:30
Henne Vogelsang
efda31870b
Merge pull request #1012 from hennevogel/master
...
Fix heroku setup
2016-05-25 17:08:20 +02:00
Henne Vogelsang
c2a706d0a1
Apparently something at heroku tries to .tr this...
2016-05-25 17:00:31 +02:00
Henne Vogelsang
a3dd8e6c95
Use config/database.yml for ClearDB config
...
If we use .env heroku neither sees DATABASE_URL nor
config/database.yml and assumes we use postgre. There
also is no need to load the rails env in the task.
2016-05-25 16:49:56 +02:00
Henne Vogelsang
70e82632f2
If no DATABASE_URL is set heroku used postgre
...
So set it to some imaginary value. We use a generated database.yml anyway.
2016-05-25 16:32:03 +02:00
Henne Vogelsang
36b397796d
Inherited apps need other deploy steps than master
...
We need to setup DATABASE_URL before deploying and populate the database after. Also there is no need for the heroku ruby buildpack twice...
2016-05-25 15:15:54 +02:00
Henne Vogelsang
799bb6979e
Update app.json
2016-05-25 14:48:02 +02:00
Henne Vogelsang
28eed457b2
Add a rake task to setup DATABASE_URL for ClearDB
...
There currently is no other way to inherit environment
variables from parent apps on heroku
2016-05-25 14:41:16 +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
fc52cd008e
Do not inherit DATABASE_URL
2016-05-25 13:44:26 +02:00
Henne Vogelsang
771bef7e36
Merge pull request #998 from differentreality/task_events_with_wrong_track_id
...
Add task to remove non-existent track_id from Event.
2016-05-25 12:04:09 +02:00
Christian Bruckmayer
dcb27ae999
Merge pull request #1009 from hennevogel/routing
...
Fix program routing outside of Admin
2016-05-23 17:20:14 +02:00
Henne Vogelsang
30e10a4e40
Fix program routing outside of Admin
...
We don't have ProgramsController so we can't have routes
for it
2016-05-23 15:18:25 +02:00
Stella Rouzi
7f97079e9b
name of task
2016-05-23 15:00:02 +03:00
Stella Rouzi
d17268e4e1
change name of task
2016-05-23 14:56:49 +03:00
Stella Rouzi
63df0d880b
dry
2016-05-23 14:56:49 +03:00
