Commit graph

291 commits

Author SHA1 Message Date
Chrisbr
9e831cb514 Merge with master 2014-05-12 15:26:46 +02:00
Chrisbr
d97e3603b1 Merge with master 2014-05-12 15:26:18 +02:00
Artem Chernikov
374efd311f Merge pull request #93 from differentreality/proposal_show
Show more information in proposal page
2014-05-12 14:58:30 +02:00
Chrisbr
27f35a49c6 Fix create conference form
- adds HTML 5 validations
2014-05-12 14:38:55 +02:00
Chrisbr
c742e57534 Fix Hound CI violations 2014-05-10 18:02:29 +02:00
Chrisbr
12e6fd9cb5 Bugfix to pass feature test
- check if session[:return_to] is nil
- adds unique html ids for dropdown login fields
2014-05-10 17:52:26 +02:00
Chrisbr
7e7dadac88 Fix Hound CI violations 2014-05-10 16:09:24 +02:00
Chrisbr
1976276d4d Bugfix to pass user model tests 2014-05-10 15:58:02 +02:00
Chrisbr
8aa68fb84a Installs database cleaner
- preparation for feature tests with capybara
see:
http://devblog.avdi.org/2012/08/31/configuring-database_cleaner-with-rails-rspec-capybara-and-selenium/
2014-05-10 15:55:17 +02:00
Chrisbr
546977fc02 Fix Hound CI violations 2014-05-10 10:24:58 +02:00
Chrisbr
0661b86b1c Bugfix for Conference Controller update 2014-05-09 14:44:18 +02:00
Stella
b4425128e6 Mention if registration is required 2014-05-02 22:52:58 +03:00
Stella
8be5750382 show speaker's email 2014-05-02 22:52:11 +03:00
Stella
c5c240888c Add details of proposal in show page 2014-05-02 21:58:55 +03:00
Stella
1840a858b7 button to link to schedule 2014-05-02 21:40:42 +03:00
Stella
fdd5b6cb95 Add 'edit button' in proposal show 2014-05-02 21:33:43 +03:00
Artem Chernikov
a425d1c6e4 As exception is used - we need to interpolate this string 2014-04-30 16:11:34 +02:00
Artem Chernikov
57ad1432a5 Update form to hot new path 2014-04-30 16:10:49 +02:00
Artem Chernikov
4e395a0d7a Merge pull request #86 from ChrisBr/fix_eventtypes
Fix eventtypes form
2014-04-30 15:57:01 +02:00
Chrisbr
00b4cfd0c0 Removed public scope from event_atachment model 2014-04-30 13:44:26 +02:00
Chrisbr
b095064108 Fix eventtypes form 2014-04-30 10:47:33 +02:00
Chrisbr
8154e6f72c Fixes Hound CI violations 2014-04-28 21:42:09 +02:00
Chrisbr
169fab5c31 Fixes cfp form 2014-04-28 20:52:02 +02:00
Chrisbr
ba2051afc7 Fixes email settings form 2014-04-28 20:31:44 +02:00
Chrisbr
810908089e Refactoring: Removes not necessary named parameters 2014-04-28 20:25:43 +02:00
Chrisbr
4b401c4cea Fixes supporter level form 2014-04-28 20:19:10 +02:00
Chrisbr
e432b71fb7 Fixes social_events form 2014-04-28 20:14:43 +02:00
Chrisbr
229581efc3 Fixes eventtype form 2014-04-28 20:08:06 +02:00
Chrisbr
c67b255e05 Fixes tracks form 2014-04-28 20:01:20 +02:00
Chrisbr
c4fbf8d038 Fixes rooms form 2014-04-28 19:58:49 +02:00
Chrisbr
fc11653f27 Fixes difficulty level form 2014-04-28 19:40:07 +02:00
Chrisbr
ec0543ef3b dropped first() 2014-04-27 17:38:30 +02:00
Chrisbr
fbda757e70 Replaced find_all_by through find_by
Find_by_all is removed in Rails 4.1
2014-04-27 16:27:29 +02:00
KalabiYau
a6031df9f2 Fix failing tests. Replace ruby to 2.1.1 in travis. Update travis config 2014-04-24 22:02:50 +02:00
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02:00
Henne Vogelsang
aa17d6ea6f Merge pull request #64 from differentreality/fix_no_bio
save person attributes first
2014-04-23 15:04:55 +02:00
Stella
5e881faef2 fix controller (find and json output). Now attachments get listed (no preview though) 2014-04-21 21:13:25 +03:00
Stella
735d1ef7d2 save person attributes first 2014-04-19 16:42:52 +03:00
Henne Vogelsang
bacae17b87 One more place media types are configured... 2014-04-14 18:15:20 +02:00
Henne Vogelsang
a8179c87e8 Fix all glyphicons 2014-04-14 18:10:38 +02:00
Henne Vogelsang
980eb3b831 Only show the conf media if it's set 2014-04-14 16:39:45 +02:00
Henne Vogelsang
633fff59d8 Add conference wide media, fix proposal#show view 2014-04-14 16:25:17 +02:00
Henne Vogelsang
e3fd0c195a First tests in rspec, with factory_girl 2014-04-09 13:18:11 +02:00
Henne Vogelsang
accd7d1a58 Starting to document things with rdoc 2014-04-09 13:18:11 +02:00
Henne Vogelsang
c261876ce0 Merge pull request #51 from gopesht/delete_users
Admin able to delete users except admins
2014-04-09 12:11:48 +02:00
Henne Vogelsang
8f222db0bb Merge pull request #52 from gopesht/fix_supporter_page
fixed supporter page redirect after creation
2014-04-09 12:09:55 +02:00
Henne Vogelsang
ec2323e957 Merge pull request #58 from differentreality/schedule_public
show schedule in home page only if it is set as public
2014-04-09 12:09:11 +02:00
Henne Vogelsang
932fed8568 Merge pull request #59 from gopesht/fix_bug_update_event
Fixed Bug for checking presence of email template before sending mails
2014-04-09 12:08:00 +02:00
Henne Vogelsang
5ed51c7499 Merge pull request #61 from gopesht/fix_first_admin_setup
Fix admin first setup, email and password in README
2014-04-09 11:40:21 +02:00
Henne Vogelsang
3628253624 Merge pull request #60 from gopesht/fix_conference_create_without_start_end_date
Validations for start and end date
2014-04-09 11:38:16 +02:00