raluka
d365d5efa1
added test file for comments_controller WIP
2015-09-09 16:50:07 +02:00
raluka
e5c235ac32
WIP modified CommentsController#index
2015-09-09 12:15:59 +02:00
raluka
932cb9984f
sorting comments after event title and created at in index
2015-09-08 14:27:14 +02:00
raluka
b762b82e74
rewrite CommentsController#index to have everything in one call
2015-09-08 12:15:22 +02:00
raluka
449d466f7d
WIP changed CommentsController#index; temporary view for all_comments
2015-09-07 18:56:26 +02:00
raluka
be55456c78
event title and conference title in 2 different lines now in view
2015-09-03 17:03:05 +02:00
raluka
55eddbfde7
changed comments helper to proper return unread comments available for current_user
2015-09-03 14:20:11 +02:00
raluka
f3fa68e371
fixed Administration link in user_menu dropdown
2015-09-03 14:04:16 +02:00
raluka
bcd8e41670
added logic for available conferences based on roles in comments_controller.rb
2015-09-03 12:17:42 +02:00
raluka
5664b99dc4
changed #signed_in_with_roles(user) in ability.rb model
2015-09-01 13:01:57 +02:00
raluka
062762089b
changed wrong test for ability
2015-08-27 12:36:35 +02:00
raluka
a3b6f204cb
created can_manage_comments helper for rendering button
2015-08-26 22:09:36 +02:00
raluka
84cd952b57
created tests for user ability
2015-08-26 13:07:13 +02:00
raluka
eab2894fad
created comments with FactoryGirl
2015-08-25 14:41:09 +02:00
raluka
b6d726d40e
unread_notifications has no longer assigned instance variable
2015-08-24 17:44:24 +02:00
raluka
878e6cc1f8
small changes
2015-08-24 17:17:29 +02:00
raluka
38e8be8793
Issue#15: Added Comment Notifications: notification_emails and comments view
2015-08-24 12:06:12 +02: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
