James Mason
bf219ec015
Merge pull request #1785 from bear454/test-fix
...
Fix a flaky test.
2017-11-14 14:09:21 -08:00
James Mason
7f369507d2
Merge branch 'master' into test-fix
2017-11-14 12:37:33 -08:00
James Mason
84dedb42c3
Merge pull request #1793 from bear454/switch-transifex
...
Only include transifex JS if the ENV var is set
2017-11-14 12:36:02 -08:00
James Mason
3490644a4d
Merge branch 'master' into switch-transifex
2017-11-14 08:06:50 -08:00
rahul
4785293bf1
Add hint in start and end hour in conference#edit
2017-11-14 17:53:44 +02:00
rahul
837d8ec0db
Add popup confirmation on update button
...
Popup is added so user can confirm the changes
Closes https://github.com/openSUSE/osem/issues/1687
2017-11-14 17:53:44 +02:00
ViditChitkara
bd045c2976
added description field to cfps
...
closes #1650
done some changes
minor changes
added markdown format to cfp#show
fixed description text position in proposals
fixed truncated description text in show action
minor changes on non-admin side
2017-11-14 17:31:08 +02:00
James Mason
fba12aef24
Only include transifex JS if the ENV var is set
...
... otherwise, don't bother loading this blocking external resource.
2017-11-12 20:43:02 -08:00
James Mason
0e16b5d0ae
Merge pull request #1790 from adrianovieira/fix_speaker.email_public
...
Fix to only show speaker email if it's public
2017-11-12 17:46:39 -08:00
Adriano Vieira
6fa709a4de
Fix to only show speaker email if it's public
2017-11-12 01:55:03 -02:00
James Mason
906c05ec4e
Merge branch 'master' into test-fix
2017-11-09 08:39:59 -08:00
James Mason
81831d7df9
Merge pull request #1787 from namangupta01/program_speakers
...
programs.speakers now gives all speakers
2017-11-09 08:39:45 -08:00
Naman Gupta
d0dbb7d29e
tests are fixed
2017-11-09 02:39:41 +05:30
Naman Gupta
ada0f814a7
linting error is fixed
2017-11-09 02:00:49 +05:30
Naman Gupta
90edc648f8
programs.speakers is fixed
2017-11-09 01:40:56 +05:30
James Mason
20b849d9ce
Merge branch 'master' into test-fix
2017-11-08 09:32:19 -08:00
James Mason
aeded80a11
Merge pull request #1762 from namangupta01/include_speaker_email_in_events
...
Speaker emails in Events CSV/XLS export is included
2017-11-07 18:22:24 -08:00
James Mason
574ac63a05
Fix a flaky test.
2017-11-07 17:59:11 -08:00
James Mason
aca8adf6e8
Merge branch 'master' into include_speaker_email_in_events
2017-11-07 17:19:42 -08:00
James Mason
51dd5bdaa9
Merge pull request #1757 from bear454/organization-link
...
Fix missing link on public organizations page
2017-11-07 17:17:39 -08:00
James Mason
1c623b1c8a
Merge branch 'master' into organization-link
2017-11-07 14:32:35 -08:00
James Mason
503ee81db0
Merge pull request #1784 from bear454/nav-title-link
...
Use organization name for title link if available, but link to /
2017-11-07 14:32:23 -08:00
James Mason
714f89f6ba
Fix missing link on public organizations page
...
When viewing a conference, the Instance Name in the header points to
/organizations. On the organizations index, there's a button to see
conferences, but it does nothing. This makes it easy for public users to
get lost.
This commit:
* Adds a function to the organizations controller to show child
conferences
* Adds a public permission to see conferences through an organization
* Represents a subset of conferences, reusing conferences/index view,
for the organization
2017-11-07 14:11:13 -08:00
James Mason
6feb2e853a
Merge branch 'master' into nav-title-link
2017-11-07 14:09:33 -08:00
James Mason
170051af81
Merge pull request #1779 from adrianovieira/update_bootstrap_for_centos
...
Update bootstrap for centos box
2017-11-07 13:53:53 -08:00
James Mason
1b8f864feb
Use organization name for title link if available, but link to /
2017-11-07 13:51:10 -08:00
James Mason
04d79f65a5
Merge branch 'master' into update_bootstrap_for_centos
2017-11-07 13:20:31 -08:00
Naman Gupta
94de2e813c
test is fixed
2017-11-08 01:41:42 +05:30
Naman Gupta
2e07462d77
exports are made to be wrap_text
2017-11-08 00:49:03 +05:30
Your Name
6c8ebe586c
speakers_names is made in sentense using join
2017-11-07 23:02:01 +05:30
Your Name
52a5cb2391
speakers email field is added to pdf
2017-11-07 23:02:01 +05:30
Your Name
5b7aa56f6b
minor changes
2017-11-07 23:02:01 +05:30
Your Name
7c0fa59a0a
Speaker emails in Events CSV/XLS export is included
2017-11-07 23:02:01 +05:30
Your Name
e99287d18a
export feature for tracks and booths are done
2017-11-07 19:14:47 +02:00
Naman Gupta
be1992a03a
typos is fixed
2017-11-05 16:59:19 +02:00
James Mason
3d8aeb6a52
Merge branch 'master' into update_bootstrap_for_centos
2017-11-04 20:53:56 -07:00
Adriano Vieira
c4fad4a181
Update bootstrap to install phantomjs on centos
2017-11-05 00:55:07 -02:00
Adriano Vieira
02709597a2
Update bootstrap for centos box
2017-11-04 22:13:19 -02:00
James Mason
464b148321
Merge pull request #1772 from namangupta01/error_opening_link_to_difficulty_level
...
Error opening link to difficulty level in Revision history is removed
2017-11-03 11:57:27 -07:00
James Mason
ae0538e1ad
Merge branch 'master' into error_opening_link_to_difficulty_level
2017-11-03 11:25:29 -07:00
James Mason
f0016cb6b5
Merge pull request #1621 from namangupta01/master
...
Speaker is asked to register only when registration_period is set
2017-11-03 08:48:35 -07:00
Naman Gupta
a0e3ea75ed
consecutive ruby lines are made into the ruby filter
2017-11-02 22:57:01 +05:30
Your Name
e607aca680
user ability for registration is used for chcking whether a user can register or not
2017-11-02 22:56:21 +05:30
namangupta01
b1f32caf7c
speaker is only ask to register when registrations are open and speaker haven't registered yet
2017-11-02 22:56:21 +05:30
namangupta01
01abbfecc4
Speaker is ask to register only when registration_period is set
2017-11-02 22:56:21 +05:30
James Mason
09941c76c3
Merge pull request #1662 from tobru/openshift_compatibility
...
adapt dir permissions for openshift and add dumb-init
2017-11-02 09:38:35 -07:00
James Mason
2b7066cd8b
Merge branch 'master' into openshift_compatibility
2017-11-02 08:23:24 -07:00
James Mason
e300932512
Merge pull request #1513 from hennevogel/master
...
New opensuse deployment
2017-10-27 19:46:26 -07:00
James Mason
7048a37eb6
Merge branch 'master' into master
2017-10-27 18:26:21 -07:00
Ana María Martínez Gómez
1d07125e7d
Merge pull request #1701 from rahul2240/amount
...
Add paid option in physical ticket#index
2017-10-27 14:22:40 +02:00
