Gopesh Tulsyan
|
8b9b9decfd
|
Merge 116b862e98 into 740540de13
|
2014-05-13 10:58:48 +00:00 |
|
Henne Vogelsang
|
740540de13
|
Merge pull request #110 from hennevogel/master
Migrate all secrets to config/secrets.yml
|
2014-05-13 12:56:16 +02:00 |
|
Christian Bruckmayer
|
59a503a42d
|
Merge pull request #115 from ChrisBr/fix_confirm_event
Fix accept event workflow
|
2014-05-13 11:13:32 +02:00 |
|
Chrisbr
|
2ca99e7ab9
|
Fix accept event workflow
|
2014-05-12 18:35:28 +02:00 |
|
Henne Vogelsang
|
ee5d48d494
|
Migrate all secrets to config/secrets.yml
|
2014-05-12 18:32:26 +02:00 |
|
Artem Chernikov
|
9090cc0d38
|
Merge pull request #95 from alter/master
Fixed /admin/users
|
2014-05-12 17:20:21 +02:00 |
|
Gopesh Tulsyan
|
116b862e98
|
fixes by houndci
|
2014-05-12 20:45:53 +05:30 |
|
Gopesh Tulsyan
|
f9ec6cc893
|
Revert "Header done, needs suggestion"
This reverts commit 2a3410c7ec.
|
2014-05-12 20:38:29 +05:30 |
|
alterpub
|
645d525bdd
|
removed :email field from delegate
|
2014-05-12 18:22:41 +04:00 |
|
alterpub
|
d2ac8a30c0
|
redesigned fix
|
2014-05-12 17:53:07 +04: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 |
|
Gopesh Tulsyan
|
2a3410c7ec
|
Header done, needs suggestion
|
2014-05-10 17:55:01 +05:30 |
|
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 |
|
Gopesh Tulsyan
|
53809aaceb
|
Deleted scaffold files
|
2014-05-09 07:31:00 +05:30 |
|
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 |
|
Gopesh Tulsyan
|
65152f8753
|
Fixes to splash page view&controller
|
2014-05-08 23:35:03 +05:30 |
|
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
|
047c1dd288
|
View and controller without tests
|
2014-05-08 19:12:18 +05:30 |
|
Gopesh Tulsyan
|
5831b76955
|
Removed conferences folder from spec/views
|
2014-05-08 18:56:43 +05:30 |
|
Gopesh Tulsyan
|
5da601c235
|
Fixed initial splash page view
|
2014-05-08 18:38:14 +05:30 |
|
Gopesh Tulsyan
|
3b8b33e2d5
|
Fixes by houndci
|
2014-05-08 17:58:31 +05:30 |
|
Gopesh Tulsyan
|
c620d63b0f
|
Added view and controller for splash page with routes for show
|
2014-05-08 17:56:09 +05:30 |
|
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 |
|
Gopesh Tulsyan
|
928db0e4f4
|
Minor typo in devise
|
2014-05-08 08:35:56 +05:30 |
|
Gopesh Tulsyan
|
8e31dd04d7
|
correction mentioned by hound
|
2014-05-08 08:33:05 +05:30 |
|
Gopesh Tulsyan
|
cb8f4ccd2e
|
Linking the conferences on home page to their splash page
|
2014-05-08 08:26:25 +05:30 |
|
alter
|
42d65aef23
|
Update users_controller.rb
|
2014-05-05 02:49:35 +04:00 |
|
alter
|
7c57675693
|
Update users_controller.rb
|
2014-05-05 02:44:08 +04:00 |
|
alterpub
|
0eb82bb11f
|
Fixed /admin/users
ArgumentError in Admin::UsersController#index
wrong number of arguments (1 for 0)
Rails 4 has depricated "all" method, now it's default behaviour
|
2014-05-05 02:28:46 +04:00 |
|
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 |
|