Shubhankar Deshpande
5b0adf5c09
Merge pull request #1 from shubhankardesh/shubhankardesh-patch-1
...
Update index.pdf.prawn
2015-02-13 07:31:56 +05:30
Shubhankar Deshpande
e72af56649
Update index.pdf.prawn
...
Removed attending_social_events attribute from the prawn file. The same question "Are you attending social events?" could possibly now be asked as a custom question.
2015-02-13 07:17:43 +05:30
Henne Vogelsang
01f96e27e0
Merge pull request #585 from hennevogel/master
...
Correct Transifex API key parsing. Fixes #573
2015-02-02 13:36:06 +01:00
Stella Rouzi
6076e29733
Merge pull request #562 from differentreality/highlights_cfp
...
add highlights and fix cfp in splashpage
2015-01-22 20:40:24 +02:00
Gopesh Tulsyan
dc05cc83ac
Merge pull request #580 from openSUSE/refactor_email_settings
...
Refactor Admin Email Settings Form
2015-01-22 00:49:19 +05:30
Stella
fbdec2a58e
fix sorting in events#index with button functionality and add color/text to switch buttons
2015-01-21 20:12:57 +02:00
Stella
b8b3703175
fix table sorting in admin/events#index
2015-01-21 17:28:19 +02:00
Stella
8fab09e63b
proposal creation: only show is_highlight for organizers or cfp
2015-01-21 17:28:18 +02:00
Stella
44f693a093
fix height of switch
2015-01-21 17:28:18 +02:00
Stella Rouzi
a845dd5d7d
add bootstrap-switch for is_highlight
2015-01-21 17:28:18 +02:00
Stella Rouzi
2dd326c8b9
show only confirmed events as highlights
2015-01-21 17:28:18 +02:00
Stella
11d0a71231
fix controller update
2015-01-21 17:28:18 +02:00
Stella Rouzi
ecfc348ea8
add highlights and fix cfp in splashpage
2015-01-21 17:28:18 +02:00
Christian Bruckmayer
8e25338436
Merge pull request #582 from ChrisBr/fix71
...
Events open now in new tab when clicking in schedule
2015-01-21 15:14:19 +01:00
Henne Vogelsang
1037df2e50
Merge pull request #584 from differentreality/remove_destroy
...
remove user deletion until further notice
2015-01-21 14:16:48 +01:00
Henne Vogelsang
e9f9f6524b
Correct Transifex API key parsing. Fixes #573
2015-01-21 12:05:55 +01:00
Stella
80fbc144ac
remove user deletion until further notice
2015-01-18 22:01:05 +02:00
Gopesh Tulsyan
6afb1ee4a9
Fixing tests for email settings template
...
Refactor
Refactor
2015-01-17 21:17:39 +05:30
chrisbr
5446c349c2
Events open now in new tab when clicking in schedule
...
close #71
2015-01-15 16:28:53 +01:00
Gopesh Tulsyan
327db11a8a
Changing id tags for nav form
2015-01-15 11:12:57 +05:30
Gopesh Tulsyan
fc450b98ae
Refactor Admin Email Settings Form
2015-01-15 11:09:08 +05:30
Stella Rouzi
bca62e6204
Merge pull request #564 from differentreality/speakers
...
Remove link to change speaker in Events list
2014-12-19 10:49:48 +02:00
Christian Bruckmayer
cc80fb10cb
Merge pull request #567 from openSUSE/348
...
Adds dependent restricted association to some models
2014-12-18 15:00:18 +01:00
chrisbr
799fd0c3a4
Adds dependent restricted association to some models
...
fix #348
2014-12-18 13:38:40 +01:00
Christian Bruckmayer
01c57d0b53
Merge pull request #570 from ChrisBr/email_variables
...
Fix email variables (close #569 )
2014-12-18 12:53:44 +01:00
Christian Bruckmayer
5d2d728c9e
Merge pull request #572 from ChrisBr/tickets
...
Fix ticket total price on each row
2014-12-18 12:53:37 +01:00
Henne Vogelsang
e1c3bce4a7
Allow signed in users to index tickets. Fixes #571
2014-12-18 11:42:42 +01:00
Henne Vogelsang
75b5594302
Disable transifex for now. It's Issue #573 now
2014-12-17 17:09:06 +01:00
chrisbr
0ea8228aa2
Fix ticket total price on each row
2014-12-17 16:56:31 +01:00
chrisbr
a629852f91
Fix email variables ( close #569 )
2014-12-17 14:28:31 +01:00
Henne Vogelsang
87b1aba1e9
Add conference description to the index view
2014-12-16 15:07:57 +01:00
Henne Vogelsang
97bbd6adb6
Fix email_settings cfp call
2014-12-16 11:26:03 +01:00
Stella Rouzi
dab0d9db16
Merge pull request #556 from differentreality/abilities
...
Fix authorization
2014-12-11 20:49:18 +02:00
Stella Rouzi
d7873c9e6c
do not index users unless organizer or admin
2014-12-11 13:17:11 +02:00
Stella
d41988c74f
Fix authorization
2014-12-11 13:17:11 +02:00
Stella Rouzi
33bbbc9566
Merge pull request #565 from differentreality/registration
...
typo in pluralization
2014-12-11 12:51:33 +02:00
Stella Rouzi
ba5731cc18
typo in pluralization
2014-12-11 10:31:30 +02:00
Stella Rouzi
0033567a5c
Remove link to change speaker.
2014-12-11 09:48:54 +02:00
Henne Vogelsang
eb817569a5
Only show confirmed speakers on registrations
2014-12-10 16:40:50 +01:00
Henne Vogelsang
b65a33f047
Merge pull request #560 from hennevogel/feature-user-view
...
Various small UI fixes
2014-12-09 15:52:44 +01:00
Henne Vogelsang
c6bd65deaa
Fix Stellas review gripes
2014-12-09 15:19:01 +01:00
Henne Vogelsang
e9456be31a
Merge pull request #554 from differentreality/cfp_dates
...
cfp validations
2014-12-05 16:25:10 +01:00
Henne Vogelsang
f91de69ede
Merge pull request #558 from differentreality/confirmations
...
sign in user after confirmation
2014-12-05 16:24:19 +01:00
Henne Vogelsang
a52918c273
Merge pull request #555 from differentreality/mock_credentials
...
add username for mock credentials of openid in development
2014-12-05 16:24:10 +01:00
Henne Vogelsang
d13efa5f52
Various small fixes for the participant UI
2014-12-05 16:04:34 +01:00
Stella Rouzi
01f2fae396
Merge pull request #559 from differentreality/attachments
...
remove event_attachments table
2014-12-04 14:05:31 +02:00
Stella Rouzi
6d0f3021ca
rubocop styling
2014-12-01 14:40:31 +02:00
Stella
31df114ce4
sign in user after confirmation
2014-12-01 14:40:31 +02:00
Stella Rouzi
343bdec617
Merge pull request #557 from differentreality/wording_styling
...
Wording styling
2014-12-01 14:07:40 +02:00
Stella
a7be4bc88e
remove event_attachments table
2014-11-30 20:32:56 +02:00
