chrisbr
|
580c6c6ed9
|
Refactoring lodgings
|
2014-11-12 12:00:03 +01:00 |
|
Christian Bruckmayer
|
c0cdf3e6e5
|
Merge pull request #504 from ChrisBr/menu
Implements new admin menu structure #304
|
2014-11-12 11:13:16 +01:00 |
|
chrisbr
|
49d565def2
|
Implements iChain authentication
|
2014-11-04 17:42:47 +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 |
|
Stella Rouzi
|
f91467a00a
|
remove trailing spaces and blank lines
|
2014-09-02 21:41:25 +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
|
2b0d7b880b
|
Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall phantomjs.
|
2014-08-19 10:32:37 -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 |
|
Stella Rouzi
|
7ebfbae7ab
|
fix test
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
79af7266ec
|
Merge pull request #452 from differentreality/conference_view_test_edit
fix view test to search for input field with correct value
|
2014-08-15 20:38:44 +03: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
|
e9530dce9b
|
fix view test to search for input field with correct value
|
2014-08-15 13:32:25 +03:00 |
|
Stella Rouzi
|
09dea4b4c5
|
fix typo openSUSE
|
2014-08-15 13:10:35 +03:00 |
|
Stella Rouzi
|
88f613ef8c
|
Add controller tests for roles
|
2014-08-15 11:37:11 +03:00 |
|
Stella Rouzi
|
efc00787fc
|
style fix
|
2014-08-14 20:18:38 +03: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
|
f7ef401be7
|
style fixes
|
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 |
|
Stella Rouzi
|
e6cdb3a6ce
|
style fix
|
2014-08-07 09:19:58 +03:00 |
|
Chrisbr
|
2a731e8350
|
Refactoring Conference/Event media to new media object
close #420
|
2014-08-06 14:30:50 +02:00 |
|
Henne Vogelsang
|
850beb72e1
|
Merge pull request #409 from hennevogel/refactor-conference-contact
Refactor conference contact
|
2014-08-06 11:56:14 +02:00 |
|
Gopesh Tulsyan
|
23c68211f0
|
Redirect to root path if splash is not public
|
2014-08-04 18:49:45 +05:30 |
|
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 |
|
Artem Chernikov
|
f8784fdcd8
|
rubocop style fix Style/AlignParameters
|
2014-07-30 23:32:29 +02:00 |
|
Artem Chernikov
|
cb810e58ce
|
Style/AlignHash fix
|
2014-07-30 23:29:52 +02:00 |
|
Gopesh Tulsyan
|
f5c53f77cf
|
Email notification on cfp dates updates and schedule made public
|
2014-07-26 11:15:37 +05:30 |
|
Henne Vogelsang
|
2dea55069d
|
Merge pull request #356 from hennevogel/proposals
Refactored proposal. Enabled cancancan
|
2014-07-23 17:56:32 +02:00 |
|
Henne Vogelsang
|
c982cbb88a
|
Refactored proposal. Enabled cancancan
|
2014-07-23 16:24:05 +02:00 |
|
Christian Bruckmayer
|
3e5a089eb1
|
Merge pull request #367 from ChrisBr/fix_js_error
Enables poltergeist and fixes js error on dashboard
|
2014-07-23 16:16:56 +02:00 |
|
Chrisbr
|
6c0daf3c3e
|
Enables Javascript error validation for poltergeist
|
2014-07-23 16:06:19 +02:00 |
|