gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 20:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1119 commits 15 branches 2 tags 50 MiB
Commit graph

91 commits

Author SHA1 Message Date
Christian Bruckmayer
97bf86454e Merge pull request #518 from ChrisBr/lodgings 
Refactoring admin lodging menu
 2014-11-12 12:47:30 +01:00
Christian Bruckmayer
5a80adaee5 Merge pull request #539 from ChrisBr/venue 
Refactoring venue
 2014-11-12 12:47:14 +01:00
chrisbr
9d08f52636 Refactoring venue 2014-11-12 12:12:57 +01:00
Christian Bruckmayer
56747fc118 Merge pull request #515 from ChrisBr/rooms 
Refactoring admin room menu
 2014-11-12 12:01:10 +01:00
chrisbr
580c6c6ed9 Refactoring lodgings 2014-11-12 12:00:03 +01:00
chrisbr
6a373b5f6c Refactoring rooms 2014-11-12 11:37:28 +01:00
Chrisbr
9376fe57e3 Moves sponsor email attribute from conference to contact 2014-11-12 11:16:22 +01:00
Chrisbr
be68877f1a Implements new admin menu structure #304 
close #305
 2014-09-30 12:57:56 +02:00
Stella Rouzi
46aed52c85 commercials 2014-09-03 00:18:45 +03:00
Stella Rouzi
bb731aec00 tickets controller fix message 2014-09-02 23:28:23 +03:00
Stella Rouzi
da061b3902 exclude config/ from rubocop styling, more style fixes 2014-09-02 21:45:07 +03:00
Stella Rouzi
b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) 2014-09-02 21:45:07 +03:00
Chrisbr
fedb0753bf Extracted Splashpage from Conference 
#418
 2014-08-31 22:59:42 +02:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
James Mason
b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes 
Minor fixes
 2014-08-19 14:24:21 -07:00
James Mason
89c77fa33b trigger click instead of .click 2014-08-19 10:09:24 -07:00
James Mason
818fd96418 Adding a network delay on subsequent action in proposal spec. 
Without this, I get consistent failures, and others experience intermmitent failures, on this spec.
 2014-08-19 08:49:51 -07:00
Chrisbr
ed55e2bf3a Introduces new RegistrationPeriod Object for Conference 
#416
 2014-08-18 14:33:02 +02:00
Chrisbr
d0e9805456 Removes dulplicate conference update action and moves methods out of private area 2014-08-15 16:06:02 +02:00
Stella Rouzi
7d35fc2857 fix test and add test for roles view 2014-08-14 19:58:50 +03:00
Stella Rouzi
911143c006 fix in admin menu and rework menu tests 2014-08-14 16:46:34 +03:00
Stella Rouzi
ba6643a394 fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout 2014-08-14 11:37:30 +03:00
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
f5081813d9 fix from rebase 
Conflicts:
	app/views/layouts/_admin_sidebar.html.haml
 2014-08-13 22:53:14 +03:00
Stella Rouzi
71dfb3b7e4 fix conflicts 2014-08-13 22:53:13 +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
5f96c276e9 Rework the Sign Up/Sign In views 
Use Capybaras save_page when feature tests go wrong
 2014-08-01 13:35:06 +02:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Christian Bruckmayer
0ae7991943 Merge pull request #360 from ChrisBr/event_states_bf_new 
Email Settings refactoring and bug fixes
 2014-07-23 15:39:07 +02:00
Christian Bruckmayer
35c5116051 Merge pull request #347 from ChrisBr/fix_test_dates 
Implements timecop to make tests independent from DateTime
 2014-07-23 15:20:44 +02:00
Chrisbr
6f3426b6a2 Implements "Add template" button for email settings 
close #16
Subjects now mandatory if send mail enabled
 2014-07-23 13:42:18 +02:00
Artem Chernikov
d9d72eae07 Merge pull request #349 from openSUSE/review_140721_basic_rubocop_rules 
[Review] Request from 'KalabiYau' @ 'openSUSE/osem/review_140721_basic_rubocop_rules'
 2014-07-23 11:00:30 +02:00
Chrisbr
7c51d1a42f Implements timecop to make tests independent from DateTime (close #327) 2014-07-23 10:28:15 +02:00
Artem Chernikov
056fe5ec3f Fix others additional lints 2014-07-21 15:05:58 +02:00
Stella Rouzi
be468be5d7 Only show openid options if providers are set in User model. 2014-07-20 19:43:20 +03:00
Henne Vogelsang
1d3c84c24d Make the spec aware of our new default event_types 2014-07-16 14:23:16 +02:00
KalabiYau
dbb210908b Update and fix test kitchet to be conformant with poltergeist 2014-07-07 15:06:43 +02:00
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Stella Rouzi
de58ddde50 openid fixes 2014-06-19 12:58:05 +03:00
Stella Rouzi
600adde6ba implement openID authentication 2014-06-19 12:58:05 +03:00
Gopesh Tulsyan
01bd45a045 Adds website link to lodging 2014-06-16 22:56:12 +05:30