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
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
Naman Gupta
77d8bfe496
styling failing error is corrected
...
minor changes
2017-10-22 18:58:27 +05:30
Naman Gupta
0cd8d21611
minor changes
2017-10-22 16:30:54 +05:30
Naman Gupta
15813f9be6
difficulty level code redundancy is removed
2017-10-22 13:09:43 +05:30
Naman Gupta
d00dc631f8
Error opening link to difficulty level in Revision history is removed
2017-10-21 02:42:08 +05:30
James Mason
885ebc4186
Merge pull request #1723 from namangupta01/error_opening_revision_history
...
error in revision history is removed
2017-10-20 13:01:35 -07:00
Naman Gupta
aaa34c64af
link is corrected
2017-10-20 23:38:59 +05:30
James Mason
021564d3db
Merge branch 'master' into openshift_compatibility
2017-10-19 18:26:01 -07:00
James Mason
c33520dbdf
Merge branch 'master' into error_opening_revision_history
2017-10-19 15:37:35 -07:00
James Mason
5e0cffb811
Merge pull request #1699 from tobru/currency_chf
...
Add currency CHF
2017-10-19 15:37:15 -07:00
James Mason
23805abffe
Merge branch 'master' into error_opening_revision_history
2017-10-19 12:11:32 -07:00
James Mason
58f7e60dba
Merge branch 'master' into currency_chf
2017-10-19 11:55:30 -07:00
James Mason
7113d2440e
Merge pull request #1770 from ud-jindal/master
...
Fixed typo.
2017-10-19 10:07:09 -07:00
Udit Jindal
613351378f
Merge branch 'master' of https://github.com/openSUSE/osem
2017-10-19 01:46:15 +05:30
Udit Jindal
3d8b32d90b
fixed doubly typed route
2017-10-19 01:41:40 +05:30
James Mason
caf2215f5b
Merge branch 'master' into currency_chf
2017-10-17 07:14:13 -07:00
ViditChitkara
f44e6e5ca5
fixed openid username
...
closes #1747
minor changes for styling issue
2017-10-17 15:49:04 +03:00
James Mason
e96a5338e2
Attempting to stabilize another flaky test.
2017-10-17 15:33:04 +03:00
James Mason
8ddcd695f0
Add vendor picture interface; include in splash
...
Vendor has a picture atrribute, and was displayed in one form of the
splashpage, but it wasn't exposed in the vendor editing form, nor was it
included in the "map view" on the splash page.
Additionally, the map popup was rendered inline.
This commit:
* Adds a from input for editing Venue#picture, consistent with other
form elements
* Displays the picture on the splash page in either style (map or
static)
* Moves the splash page map popup from inline HTML to it's own partial
2017-10-17 15:33:04 +03:00
James Mason
b80f60ed33
Merge branch 'master' into openshift_compatibility
2017-10-16 08:24:03 -07:00
James Mason
eaa8ad8005
Merge pull request #1766 from rahul2240/venue
...
Add link to venue when venue is not set
2017-10-16 08:18:33 -07:00
rahul
03c9f7deb1
Add turnover for admin
...
Admin can see the turnover amount for each ticket type.
2017-10-14 23:07:09 +05:30
rahul
0d70832f5b
Add total amount spent by user
...
User can see the total amount that he paid for the tickets and total amount spent by him on each ticket
2017-10-14 23:07:08 +05:30
rahul
b761e83b45
Add amount paid
...
Amount paid colum is added to ticket purchase to keep the record of money paid by the user.
It is added to physical_ticket#index to show admin, price paid by each user for each ticket.
2017-10-14 23:06:57 +05:30
rahul
3f3cdef520
Fix decimal limit of total to 2
...
Decimal limit is fixed to 2 as earlier at some values the decimal limit were crossing this limit
2017-10-14 21:41:54 +05:30
rahul
33bfb3d3c2
Add link to venue when venue is not set
...
Link to create rooms is removed from schedules#show when venue is not set as creating room without venue will show error
Closes https://github.com/openSUSE/osem/issues/1729
2017-10-14 20:41:41 +05:30
James Mason
2f8454a837
Merge pull request #1760 from rishabhptr/role-link
...
Fixed roles link in revision_history
2017-10-13 12:03:49 -07:00
