mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-05-16 12:35:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
517 Commits 19 Branches 2 Tags
98e3784eba7ff5a9ce7f29fe07ee5181dbfe87bb
Commit Graph

517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gopesh Tulsyan
98e3784eba Feature testing user specs 2014-05-28 23:51:04 +05:30
James Mason
c6f2b4f641 Merge pull request #169 from gopesht/fix_controller_test_for_splash 
Controller test for Conference#show
 2014-05-28 09:40:28 -07:00
James Mason
af8daa3b1a Merge pull request #167 from gopesht/conference_date_helper 
Modified date helper
 2014-05-28 09:30:00 -07:00
Christian Bruckmayer
b6538cddb2 Merge pull request #171 from ChrisBr/bugfix_sidebar 
Removes new conference link form loop
 2014-05-28 14:25:15 +02:00
Christian Bruckmayer
6155286b24 Merge pull request #172 from ChrisBr/add_color_to_conference 
Adds color attribute to model
 2014-05-28 14:24:56 +02:00
Gopesh Tulsyan
1183ee6da9 Added method to wrap the date helper to recieve two dates instead of a object 2014-05-28 17:18:54 +05:30
Chrisbr
dc080705ae Adds color attribute to conference 2014-05-28 13:40:58 +02:00
Chrisbr
d1d75e97a4 Removes new conference link form loop 2014-05-28 13:31:42 +02:00
Gopesh Tulsyan
89e759daf6 Controller test for Conference#show 2014-05-28 15:06:08 +05:30
Christian Bruckmayer
a33e930111 Merge pull request #162 from ChrisBr/removes_header 
Renmanes Conference edit link to Settings in admin menu
 2014-05-26 11:41:11 +02:00
Christian Bruckmayer
989848ce88 Merge pull request #153 from ChrisBr/redirect_admin 
Redirects to admin/index after admin login
 2014-05-26 11:40:54 +02:00
Chrisbr
ff49443e9a Redirects to admin/index after admin login 2014-05-23 17:05:19 +02:00
Chrisbr
cd83cb2f8f Renmanes Conference edit link to Settings in admin menu 2014-05-23 16:49:34 +02:00
Christian Bruckmayer
643b8b173a Merge pull request #161 from ChrisBr/bugfix_admin_menu 
Shows dropdown on load if path correspondent to link
 2014-05-23 16:29:48 +02:00
Chrisbr
61606d3932 Shows dropdown on load if path correspondent to link 2014-05-23 15:32:07 +02:00
Christian Bruckmayer
b97b48b1eb Merge pull request #156 from ChrisBr/remove_admin_dd 
Removes admin from dropdown
 2014-05-23 15:07:16 +02:00
Christian Bruckmayer
e9e3dad431 Merge pull request #155 from ChrisBr/dd_admin 
Dropdown shows now context
 2014-05-23 15:07:08 +02:00
Christian Bruckmayer
d52678e348 Merge pull request #154 from ChrisBr/new_admin_rb 
Moves conference show #action to #edit action
 2014-05-23 14:38:39 +02:00
Chrisbr
a9814146ff Removes admin from dropdown 2014-05-23 14:30:59 +02:00
Chrisbr
cd8e8a5c7e Dropdown shows now context 2014-05-23 14:19:57 +02:00
Chrisbr
ab4d3021a2 Moves conference show #action to #edit action 2014-05-23 13:01:23 +02:00
Christian Bruckmayer
738098e4a9 Merge pull request #151 from ChrisBr/new_admin_rb 
New admin menu
 2014-05-23 12:43:52 +02:00
Chrisbr
89fb059aaa New admin menu 2014-05-22 18:19:07 +02:00
Gopesh Tulsyan
29cd9d0132 Merge pull request #144 from gopesht/view_specs 
View specs, added factories.
 2014-05-21 16:33:16 +05:30
Gopesh Tulsyan
7a19fefd53 houndci fixes 2014-05-21 16:20:02 +05:30
Gopesh Tulsyan
d1e9bd06a6 View specs, added factories, fixed bugs 2014-05-21 16:20:02 +05:30
Gopesh Tulsyan
322ddd1501 Merge pull request #148 from gopesht/splash_page 
Create view for splash page from existing routes
 2014-05-20 19:39:23 +05:30
Stella Rouzi
2e7eb7d367 Merge pull request #137 from differentreality/resources_registrations 
resources :registrations
 2014-05-19 22:27:47 +03:00
Gopesh Tulsyan
03138fd40d fixes by houndci 2014-05-19 21:25:42 +05:30
Gopesh Tulsyan
7a5f47257a Create view for splash page from existing routes 2014-05-19 21:21:06 +05:30
Christian Bruckmayer
e11ad83b32 Merge pull request #147 from ChrisBr/sp_registration 
Implements strong parameters for registration controller
 2014-05-19 13:38:41 +02:00
Christian Bruckmayer
7cf139cc9b Merge pull request #145 from ChrisBr/remove_gravater_alt 
Removes gravater alt text
 2014-05-19 13:16:26 +02:00
Chrisbr
074ca56cb2 Implements strong parameters for registration controller 2014-05-19 13:01:07 +02:00
Chrisbr
8e0b9193e2 Removes gravater alt text 2014-05-19 11:20:11 +02:00
Christian Bruckmayer
c78a09cc53 Merge pull request #143 from ChrisBr/bugfix_account_edit 
Implements devise strong parameters for registration
 2014-05-19 11:18:00 +02:00
Christian Bruckmayer
de0ada0bd1 Merge pull request #142 from ChrisBr/flash 
fix flash css classes
 2014-05-19 10:58:22 +02:00
Chrisbr
04c00e4b0c Implements devise strong parameters for registration 2014-05-16 20:31:41 +02:00
Chrisbr
6ac8f6fd7a fix flash css classes 2014-05-16 19:52:41 +02:00
Stella Rouzi
7a209e10a7 Merge pull request #138 from differentreality/houndci 
configure houndci to allow lines up to 100 chars
 2014-05-16 15:59:49 +03:00
Stella Rouzi
7d921929a0 configure houndci to allow lines up to 100 chars 2014-05-15 21:25:29 +03:00
Stella Rouzi
e921e4da22 new Ruby 1.9 hash syntax 2014-05-15 21:04:08 +03:00
Stella Rouzi
544146e7a9 houndci fixes 2014-05-15 20:55:27 +03:00
Stella Rouzi
7490316a5b resources :registrations 2014-05-15 20:30:01 +03:00
Gopesh Tulsyan
045e434f3d Merge pull request #134 from gopesht/fix_admin_dashboard_modal 
Fixed admin/users modal display
 2014-05-15 19:00:06 +05:30
Christian Bruckmayer
bf19cec236 Merge pull request #135 from ChrisBr/update_nokogiri 
Updates nokogiri
 2014-05-15 14:38:37 +02:00
Christian Bruckmayer
baf9e4f2fd Merge pull request #132 from ChrisBr/difficulty_levels_spec 
Implements difficulty level feature test
 2014-05-15 14:20:16 +02:00
Christian Bruckmayer
6cc9e16c73 Merge pull request #131 from ChrisBr/event_types_spec 
Implements event types feature test
 2014-05-15 14:20:05 +02:00
Chrisbr
799fba1321 Updates nokogiri 2014-05-15 14:18:33 +02:00
Gopesh Tulsyan
86b007d60e Fixed admin/users modal display 2014-05-15 17:47:34 +05:30
Christian Bruckmayer
7c7cbc0310 Merge pull request #130 from ChrisBr/tracks_spec 
Implements tracks feature test
 2014-05-15 13:49:04 +02:00