gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
495 commits 15 branches 2 tags 50 MiB
Commit graph

67 commits

Author SHA1 Message Date
Gopesh Tulsyan
322ddd1501 Merge pull request #148 from gopesht/splash_page 
Create view for splash page from existing routes
 2014-05-20 19:39:23 +05:30
Gopesh Tulsyan
7a5f47257a Create view for splash page from existing routes 2014-05-19 21:21:06 +05:30
Stella Rouzi
544146e7a9 houndci fixes 2014-05-15 20:55:27 +03:00
Stella Rouzi
7490316a5b resources :registrations 2014-05-15 20:30:01 +03:00
Henne Vogelsang
f6088e9abe Merge pull request #117 from hennevogel/callforpapers 
Fix the callforpapers routing and some styling issues
 2014-05-14 11:29:53 +02:00
Christian Bruckmayer
e8b9c26778 Merge pull request #113 from ChrisBr/feature_tests 
tests
 2014-05-13 15:54:18 +02:00
Henne Vogelsang
e4c19ab1f6 Fix the callforpapers routing and some styling issues 2014-05-13 14:17:39 +02:00
Henne Vogelsang
ee5d48d494 Migrate all secrets to config/secrets.yml 2014-05-12 18:32:26 +02:00
Chrisbr
d97e3603b1 Merge with master 2014-05-12 15:26:18 +02:00
Chrisbr
27f35a49c6 Fix create conference form 
- adds HTML 5 validations
 2014-05-12 14:38:55 +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
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
James Mason
022c733b6d Suggest an in-memory db for testing. 2014-05-08 12:05:57 -07:00
Gopesh Tulsyan
a409fc8119 replacing put requests by patch for rails 4 compatibility 2014-05-08 14:18:06 +05:30
Artem Chernikov
90fe1cc995 Replace update from member to collection 2014-04-30 16:11:14 +02:00
Chrisbr
195ebe6622 Merge branch 'master' of https://github.com/openSUSE/osem into fix_eventtypes 2014-04-30 12:19:43 +02:00
Artem Chernikov
8e8e5e4b23 Merge pull request #82 from openSUSE/review_140427_move_session_hash_secret_to_config 
Remove insecure storage of cookies secret
 2014-04-30 10:57:44 +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
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
KalabiYau
019b570a70 Remove insecure storage of cookies secret 2014-04-27 18:03:47 +02:00
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02:00
Henne Vogelsang
5923a66a88 Quote the confile.yml.example 2014-04-23 15:06:14 +02:00
Henne Vogelsang
4592802411 Enable errbit/hoptoad, update rake 2014-04-11 12:32:15 +02:00
Henne Vogelsang
18968a05b1 * Update devise to latest version 
* use letter_opener for mails in development
* bring back the flash
* fix redirect loop for logging in
* move all mailer/devise settings to config/config.yml
 2014-03-24 12:45:47 +01:00
Henne Vogelsang
5b05ffbd56 Rename the volunteers to match the other config routes 2014-03-04 10:30:23 +01:00
Henne Vogelsang
97eae285c5 Get rid of the error page after sign up 2014-03-04 10:18:07 +01:00
Henne Vogelsang
14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers 
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
 2014-03-03 10:52:24 +01:00
Henne Vogelsang
243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions 
Conflicts:
	app/models/conference.rb
	config/routes.rb
 2014-03-03 10:43:38 +01:00
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09:09 +02:00
Stella
3105c8da5d question builder 2014-02-09 18:05:57 +02:00
Stella
64b2b8b3f8 Volunteers, positions and days and volunteers list for admin, volunteering option for attendees 2014-01-01 11:39:59 +02:00
differentreality
834362491e star voting system for proposals 2013-08-16 16:06:01 +03:00
Ancor Gonzalez Sosa
740a604c01 Adding api/v1/conferences/x/conferences 
* A little weird, but needed by suseconferenceclient
 2013-07-16 17:04:48 +02:00
differentreality
4532ad8c0a new registration 2013-07-12 19:29:48 +03:00
Henne Vogelsang
83b20dfc58 Merge pull request #18 from differentreality/stats 
Stats
 2013-07-12 04:43:23 -07:00
differentreality
19b11a79ff Edit registration for admin 2013-07-12 13:37:30 +03:00
differentreality
6879ca28e5 add option to delete registration 2013-07-12 13:37:29 +03:00
differentreality
f53af55a74 add pagination, re-arrange view 2013-07-12 13:37:29 +03:00
differentreality
d2709f0570 admin adds new user/person and registration 2013-07-12 13:31:41 +03:00
differentreality
a71a16922c Add admin stats page 2013-07-12 12:30:31 +03:00
Ancor Gonzalez Sosa
c6956482f0 Speaker can be changed in admin/conference/x/events 2013-07-11 09:04:54 +02:00
Ancor Gonzalez Sosa
d95d8f234b json API for suseconferenceclient 2013-07-08 10:07:12 +02:00