Henne Vogelsang
f2cdea4f1a
Integrate the splash page into the general layout
...
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
2014-11-17 13:58:27 +01:00
Henne Vogelsang
f21c85ad4b
Merge pull request #542 from hennevogel/feature-splash
...
Get rid of the home controller
2014-11-17 13:55:24 +01:00
Henne Vogelsang
e65ca7fb58
Get rid of the home controller
2014-11-14 17:24:24 +01:00
Stella
b43b68ac4f
api key not visible
2014-11-14 15:03:56 +02:00
Stella Rouzi
4df9fa0fdb
Merge pull request #525 from differentreality/subscribe
...
Subscribe option: move to its own controller, add authorization
2014-11-12 16:17:09 +02:00
Henne Vogelsang
1c909e60f6
Make it possible to call :notify_errbit with mina manually
2014-11-12 13:09:26 +01:00
Stella
3be200abcc
move subscribe to its own controller, add authorization, test subscribe/unsubscribe
2014-11-12 14:00:17 +02:00
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
Henne Vogelsang
12e04af21f
Deploy piwik config
2014-11-12 12:38:54 +01:00
chrisbr
9d08f52636
Refactoring venue
2014-11-12 12:12:57 +01:00
Henne Vogelsang
5b78666eb8
Merge pull request #538 from hennevogel/master
...
Implements piwik tracking
2014-11-12 12:04:36 +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
Henne Vogelsang
796d063eda
Implements piwik tracking
2014-11-12 10:45:44 +01:00
Henne Vogelsang
c3b0dcc9d7
Set the ichain base url
2014-11-06 10:28:19 +01:00
chrisbr
49d565def2
Implements iChain authentication
2014-11-04 17:42:47 +01:00
chrisbr
15c6ed127f
Implements username authentication
...
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
2014-11-03 15:25:33 +01: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
Henne Vogelsang
f212aeeb30
Add a rake task to the deployment to backup the DB.
...
Apparently needed with all the broken migrations...
2014-08-20 00:49:48 +02:00
Henne Vogelsang
f2bbb68ad9
Update rails to address CVE-2014-3514. Fix the deployment
2014-08-19 12:31:31 +02:00
Artem Chernikov
65291d8b0d
Merge pull request #450 from gopesht/dj_deploy
...
Adds delayed jobs recipe for production, and some documentation
2014-08-19 09:50:36 +02:00
Chrisbr
ed55e2bf3a
Introduces new RegistrationPeriod Object for Conference
...
#416
2014-08-18 14:33:02 +02:00
Gopesh Tulsyan
98112b5a03
Adds delayed jobs recipe for production, and some documentation added for running delayed jobs in local
2014-08-15 22:13:07 +05:30
Henne Vogelsang
71bf793cdf
Merge pull request #451 from hennevogel/master
...
Fix email from config variable. Fixes #446
2014-08-15 14:12:21 +02:00
Artem Chernikov
566382eca8
Merge pull request #441 from differentreality/cancancan
...
Cancancan
2014-08-15 12:00:35 +02:00
Henne Vogelsang
63cf8e784a
Fix email from config variable. Fixes #446
2014-08-15 11:58:47 +02:00
Stella Rouzi
b1c65eea79
style fix
2014-08-15 06:16:42 +03:00
Stella Rouzi
035988a2e1
remove keys
2014-08-15 06:16:42 +03:00
Stella Rouzi
bf6b09d9f4
add github for openid login
2014-08-15 06:16:42 +03:00
Stella Rouzi
c8e741d0ca
openID keys for localhost in example secrets, so that openID works out of the box
2014-08-15 06:16:42 +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
c9d608175b
fix from rebase
2014-08-13 22:53:14 +03:00
Stella Rouzi
e2fb434dc7
Implement role authorization
2014-08-13 22:53:13 +03:00
Henne Vogelsang
6755328c4c
Merge pull request #443 from hennevogel/master
...
Switch to apache init restart
2014-08-13 11:41:28 +02: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
Henne Vogelsang
6e2efa502b
Switch to apache init restart as passenger's tmp/restart.txt seem not to be reliable :-/
2014-08-12 18:43:46 +02:00
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
Artem Chernikov
ac25561523
Merge pull request #432 from differentreality/style_module
...
enable style ClassAndModuleChildren
2014-08-11 10:26:23 +02:00
Artem Chernikov
0fe8c76c9b
Remove syck, add notifier back, add cleanup on deploy
2014-08-07 10:30:34 +02:00
Stella Rouzi
e06e0a5ca3
more style fixes
2014-08-07 07:42:22 +03:00
Henne Vogelsang
2f814c7320
Disable :notify_errbit in deploy. Issue #431
2014-08-06 20:48:56 +02:00
Chrisbr
2a731e8350
Refactoring Conference/Event media to new media object
...
close #420
2014-08-06 14:30:50 +02:00