Commit graph

75 commits

Author SHA1 Message Date
Stella Rouzi
beb88b848d changes from comments, fix commercials failing test 2014-08-13 22:53:15 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
c9d608175b fix from rebase 2014-08-13 22:53:14 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts
Add email settings to user accounts
2014-08-13 09:22:34 +05:30
Gopesh Tulsyan
a39f4cf0dd Subscription on Registration, Independent Subscription without registration 2014-08-12 16:47:36 +05:30
Chrisbr
22cc5e4f14 Extracting Photos form Conference edit form
close #384
2014-08-12 08:38:51 +02:00
Chrisbr
a8b94c13f3 Refactoring Conference Basics #384 2014-08-12 08:32:45 +02:00
Chrisbr
2a731e8350 Refactoring Conference/Event media to new media object
close #420
2014-08-06 14:30:50 +02:00
Henne Vogelsang
5aa0d58c57 Move Conference contact details to Contact 2014-08-01 14:30:10 +02:00
Henne Vogelsang
eb3e6898d2 Implements Contacts 2014-08-01 14:30:10 +02:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Artem Chernikov
5289f41eb5 Use only new hash syntax 2014-07-21 15:05:58 +02:00
Gopesh Tulsyan
f7337cbb77 Unused route for Conference#show 2014-07-13 16:32:12 +05:30
Chrisbr
61f913b727 Implements OPTIONS http verb for root path
close #294
2014-07-08 09:18:32 +02:00
Artem Chernikov
f58fba3f71 Rollback routes OPTIONS change [ci skip] 2014-07-07 16:10:21 +02:00
Artem Chernikov
460f763be5 Add Mina configuration 2014-07-07 16:09:07 +02:00
Gopesh Tulsyan
3bf54f991a Increased size of modal, added description as caption to photos 2014-07-02 00:25:09 +05:30
Gopesh Tulsyan
1244f937e6 Multiple ajax calls fixed 2014-07-01 22:02:52 +05:30
Gopesh Tulsyan
220e816155 Gallery initiated 2014-07-01 21:52:33 +05:30
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Stella Rouzi
44a95d9ced houndci fixes 2014-06-19 12:58:05 +03:00
Stella Rouzi
0beed70d7f some houndci fixes 2014-06-19 12:58:05 +03:00
Stella Rouzi
600adde6ba implement openID authentication 2014-06-19 12:58:05 +03:00
Stella Rouzi
37ec4ce746 fix admin schedule routing 2014-06-18 17:40:03 +03:00
Gopesh Tulsyan
e494192ad2 Adds lodgings controller and view 2014-06-16 17:54:38 +05:30
Gopesh Tulsyan
67dab025a9 Sponsors dashboard
Removed explicit rendering of sponsors
2014-06-12 23:34:27 +05:30
Gopesh Tulsyan
f68ac7e032 Sponsorship level dashboard
removed donation amount
removed explicit rendering of sponsor levels
2014-06-06 15:40:33 +05:30
Chrisbr
e5b588df81 Refactoring event states 2014-06-06 10:23:01 +02:00
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
e4c19ab1f6 Fix the callforpapers routing and some styling issues 2014-05-13 14:17:39 +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
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
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
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02:00
Henne Vogelsang
5b05ffbd56 Rename the volunteers to match the other config routes 2014-03-04 10:30:23 +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