Stella Rouzi
2a6ca7b0ff
Fix ordering for event.average_voting in events#index
2015-08-06 07:41:20 +03:00
Henne Vogelsang
a73ca335a9
Merge pull request #697 from raluka/toggle_button
...
Issue#690: fixed Attendance Button
2015-07-15 16:52:38 +02:00
raluka
3df77c84f6
Issue#690: fixed Attendance Button
2015-07-15 12:44:08 +02:00
Stella Rouzi
124d275a09
Merge pull request #671 from differentreality/registrations_xls
...
Remove redundant code.
2015-07-02 21:27:15 +03:00
Henne Vogelsang
68efa06696
Merge pull request #660 from bgeuken/conference_model
...
Conference model
2015-07-02 16:28:06 +02:00
Henne Vogelsang
5f31a4b027
Merge pull request #685 from dogodigi/iss684
...
Fix for #684
2015-07-02 16:25:19 +02:00
Stella Rouzi
8567a997cb
Merge pull request #679 from differentreality/switch
...
Rework bootstrapSwitch
2015-07-02 13:08:16 +03:00
Henne Vogelsang
35c37272e6
Update INSTALL.md
...
Link to ImageMagick install page
2015-06-30 12:33:36 +02:00
Henne Vogelsang
51b01d638c
Update INSTALL.md
...
Some styling fixes
2015-06-30 12:09:21 +02:00
Christian Bruckmayer
26ab437c9e
Merge pull request #689 from differentreality/cfp_view_spec
...
Small test addition for #687
2015-06-18 09:34:52 +02:00
Stella Rouzi
8c7821a919
Merge pull request #681 from differentreality/longitude_latitude
...
Fix longitude latitude order
2015-06-17 23:18:41 +03:00
Stella Rouzi
ebadb84f2f
Fix longitude latitude order
2015-06-17 22:08:18 +03:00
Stella Rouzi
848aa5f12a
Small test addition for #687
2015-06-17 22:04:43 +03:00
Christian Bruckmayer
491df2c5c6
Merge pull request #687 from meonkeys/fix-start-date-typo
...
fix "End Date" typo on Call for Papers show
2015-06-17 12:08:54 +02:00
Adam Monsen
279817d57d
fix "End Date" typo on Call for Papers show
2015-06-16 21:26:15 -07:00
milovanderlinden
5683974151
Fix for #684
2015-06-16 23:09:47 +02:00
Christian Bruckmayer
5b6f79bbd8
Merge pull request #659 from bgeuken/fix_registration_dates_given
...
Fix registration dates given
2015-06-15 22:06:42 +02:00
Christian Bruckmayer
a80e3d814e
Merge pull request #656 from bgeuken/make_schedules_links
...
Make talks on schedules table real links
2015-06-15 22:06:33 +02:00
Stella Rouzi
53f0606ac1
Rework bootstrapSwitch
2015-06-14 22:28:33 +03:00
Stella Rouzi
a35f98b1a3
Merge pull request #678 from kormoc/fix_abstract_word_count
...
Fix the abstrct count on the proposal create and edit pages
2015-06-14 22:15:32 +03:00
Rob Smith
922e4934ba
Fix the abstrct count on the proposal create and edit pages
...
Due to the DOM not being ready when osem.js is executed, the
bind statements do not actually bind on the correct elements.
We just wrap the binds in a document ready event which allows
the elements to fully load and the events to fire correctly.
I also bind on more then just keyup, to catch times when people
paste content into the field. The input event is only supported
by newer browsers, but is entirely a noop for older browsers.
2015-06-14 11:31:39 -07:00
Stella Rouzi
a9f806ca39
Merge pull request #674 from differentreality/dasboard_todo_venu_link
...
Edit link for venue in dashboard TODO list
2015-06-12 12:36:16 +03:00
Stella Rouzi
0013a3a814
Merge pull request #639 from differentreality/devise_partials
...
Move common views to partial
2015-06-12 12:30:51 +03:00
Stella Rouzi
b57e5a64fe
Merge pull request #670 from differentreality/users_changes
...
Users changes
2015-06-12 10:46:28 +03:00
Stella Rouzi
529a75eee6
Edit link for venue in dashboard TODO list
2015-06-12 10:34:31 +03:00
Stella Rouzi
04e9f77138
Remove redundant code.
2015-06-11 15:37:00 +03:00
Stella Rouzi
bd79719054
style
2015-06-11 15:22:54 +03:00
Stella Rouzi
2b433a9cbe
make @user definition more clear
2015-06-11 15:20:48 +03:00
Stella Rouzi
30831ce718
Add styling to passwords and confirmations
2015-06-11 15:20:48 +03:00
Stella Rouzi
28143a8cce
keep fields reference in devise new registration
2015-06-11 15:20:48 +03:00
Stella Rouzi
b8313aa064
Styling
2015-06-11 15:20:48 +03:00
Stella Rouzi
969c24c091
Move common views to partial
2015-06-11 15:20:48 +03:00
Stella Rouzi
393f26c679
De-activate buttons in registrations#show when conference has ended, so that user cannot edit registration details after the conference is over.
2015-06-11 15:15:02 +03:00
Stella Rouzi
fcca0e71d2
show label of confirmed or unconfirmed in users#show
2015-06-11 15:13:18 +03:00
Stella Rouzi
bc2b262510
add username and nickname in user#show and styling changes
2015-06-11 15:13:03 +03:00
Stella Rouzi
93bbd0ea0d
td width with col-md
2015-06-11 13:31:03 +03:00
Stella Rouzi
1890aece1d
remove datatable error in admin/users#index due to submissions table
2015-06-11 13:30:08 +03:00
Björn Geuken
c972731e20
Small refactoring of get_status & self.get_event_state_line_colors
2015-05-28 10:38:38 +02:00
Björn Geuken
12fa985fff
conference: refactor some conditions
2015-05-27 16:06:17 +02:00
Björn Geuken
5a5745947d
Simplify cfp_open? method
2015-05-27 16:06:17 +02:00
Björn Geuken
c58585d445
cleanup: if !object.nil? -> if object
2015-05-27 16:06:17 +02:00
Björn Geuken
a1d022d0be
Refactor user_registered? method
2015-05-27 16:06:14 +02:00
Björn Geuken
3e77241f8a
user_registered: Return false if user is nil
...
The return value of user_registered? is only used as boolean. So we can
don't need to hande non existent users separately.
2015-05-27 16:02:01 +02:00
Björn Geuken
e334a6dec3
Add a test for user_registered?
2015-05-27 16:02:00 +02:00
Björn Geuken
f180ce0d27
Refactor registration_open? method, part II
2015-05-21 19:16:02 +02:00
Björn Geuken
0d8a77c9ef
Refactor registration_open? method
...
The registration_period is already checked in registration_dates_given?
method. No need to check it twice
2015-05-21 19:16:02 +02:00
Björn Geuken
bc966259fb
Refactor registration_dates_given?
2015-05-21 19:16:01 +02:00
Björn Geuken
7638b33926
Fix registration_dates_given?
...
When the registration period is nil registration_dates_given? should return
false.
2015-05-21 19:16:01 +02:00
Henne Vogelsang
b15c1abd2e
Merge pull request #657 from bgeuken/calculate_progress
...
Calculate progress
2015-05-18 14:53:37 +02:00
Björn Geuken
ca7f1a3b25
Simplify progress calculation
2015-05-16 15:27:42 +02:00
