gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
403 commits 15 branches 2 tags 50 MiB
Commit graph

403 commits

This branch
This branch
All branches
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
Christian Bruckmayer
1528fb53de Merge pull request #112 from ChrisBr/fix_new_conference 
Fix create conference form
 2014-05-12 14:54:49 +02:00
Artem Chernikov
253e7800ba Merge pull request #111 from openSUSE/review_140512_fix_test_schema_loading 
Maintain schema
 2014-05-12 14:47:16 +02:00
Christian Bruckmayer
0edb91aa83 Merge pull request #102 from ChrisBr/conference_model_tests 
Conference Model tests
 2014-05-12 14:41:54 +02:00
Chrisbr
27f35a49c6 Fix create conference form 
- adds HTML 5 validations
 2014-05-12 14:38:55 +02:00
Artem Chernikov
e19aef91d0 Add docs back 2014-05-12 14:29:15 +02:00
Artem Chernikov
6e946dbb1d Maintain schema 2014-05-12 13:20:28 +02:00
Chrisbr
9256ff9e03 Deletes loading seeds for tests 
- we use factory girl and database cleaner instead
 2014-05-11 08:26:29 +02:00
Chrisbr
5423edd6b7 Fix Travis CI build 2014-05-10 18:47:16 +02:00
Chrisbr
c742e57534 Fix Hound CI violations 2014-05-10 18:02:29 +02:00
Chrisbr
110afe1192 Implements feature tests for conference add and update 2014-05-10 17:55:15 +02:00
Chrisbr
e823fc0279 Implements login macros 2014-05-10 17:54:56 +02:00
Chrisbr
d6c692962e Enables capybara-webkit 2014-05-10 17:53:31 +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
0a5f08878f Switch back to sqlite test db 
http://stackoverflow.com/questions/19493153/rails-4-use-sqlite-memory-db-for-selenium-driven-tests
 2014-05-10 16:45:51 +02:00
Chrisbr
7e7dadac88 Fix Hound CI violations 2014-05-10 16:09:24 +02:00
Chrisbr
a0d539bc3b Merge branch 'installs_database_cleaner' into user_model_tests 2014-05-10 16:03:38 +02:00
Chrisbr
f96ff6ed17 Fix Hound CI violations 2014-05-10 16:02:44 +02:00
Chrisbr
1976276d4d Bugfix to pass user model tests 2014-05-10 15:58:02 +02:00
Chrisbr
bbd9fd74d5 Implements user model tests 2014-05-10 15:57:38 +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
Chrisbr
c890aea68d Conference Controller tests 2014-05-09 14:44:01 +02:00
Chrisbr
aff37e8fb1 Conference Model tests 2014-05-09 14:14:21 +02:00
Artem Chernikov
adfa9cc871 Merge pull request #90 from openSUSE/review_140430_style_cleanup 
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140430_style_cleanup'
 2014-05-09 11:27:49 +02:00
Artem Chernikov
b041edff52 Merge pull request #100 from openSUSE/test_in_memory 
Suggest/allow an in-memory db for testing.
 2014-05-09 11:03:56 +02:00
James Mason
3b84b57a02 Seed the in-memory test db. 2014-05-08 14:48:10 -07:00
James Mason
022c733b6d Suggest an in-memory db for testing. 2014-05-08 12:05:57 -07:00
James Mason
8c7e6165a4 Merge pull request #92 from bear454/master 
Ignore rbenv's local marker
 2014-05-08 08:22:23 -07:00
Gopesh Tulsyan
f598fd9c58 Merge pull request #98 from gopesht/make_routes_compatible_with_rails4 
replacing put requests by patch for rails 4 compatibility
 2014-05-08 16:52:54 +05:30
Gopesh Tulsyan
a409fc8119 replacing put requests by patch for rails 4 compatibility 2014-05-08 14:18:06 +05:30
James Mason
13eae88160 Ignore rbenv's local marker 2014-05-02 21:10:25 -07: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
90fe1cc995 Replace update from member to collection 2014-04-30 16:11:14 +02:00
Artem Chernikov
57ad1432a5 Update form to hot new path 2014-04-30 16:10:49 +02:00
Artem Chernikov
45a6864618 Groom Gemfile. Fit into one style 2014-04-30 15:58:31 +02:00
Artem Chernikov
4e395a0d7a Merge pull request #86 from ChrisBr/fix_eventtypes 
Fix eventtypes form
 2014-04-30 15:57:01 +02:00
Artem Chernikov
60b5f876c6 Merge pull request #81 from openSUSE/review_140427_restyle_factories 
Style factories. Trigger houndci
 2014-04-30 15:03:03 +02:00
Artem Chernikov
b392245d38 Merge pull request #88 from ChrisBr/remove_scope_from_attachments 
Removed public scope from event_atachment model
 2014-04-30 14:49:30 +02:00
Artem Chernikov
8eb6a3b45b Put links to factories readme back 2014-04-30 14:48:20 +02:00
Chrisbr
00b4cfd0c0 Removed public scope from event_atachment model 2014-04-30 13:44:26 +02:00
Chrisbr
195ebe6622 Merge branch 'master' of https://github.com/openSUSE/osem into fix_eventtypes 2014-04-30 12:19:43 +02:00