Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bootstrap #82

Merged
merged 54 commits into from
Jul 4, 2014
Merged

Bootstrap #82

merged 54 commits into from
Jul 4, 2014

Conversation

agmps17
Copy link
Contributor

@agmps17 agmps17 commented Jul 4, 2014

No description provided.

cpg and others added 30 commits May 13, 2014 15:33
@cpg
Add ruyb 2.0 to travis
0573f45
@cpg
Add ruby 2.1.0 as well
15c9616
@cpg
use settings_engine.themes_path for themes' url
59db304
Adapting plugin gerator to rails 4. route definition changed.
571c514
@cpg
Merge pull request #55 from agmps18/rails-4
ac70c98 
Adapting plugin gerator to rails 4. route definition changed.
Stray message markup, and search hda routes corrected
a87bfcd
@cpg
Merge pull request #58 from agmps18/rails-4
dc23e75 
Stray message markup, and search hda routes corrected
Adding Back Debug Page
1bbad29
@agmps17
Attribute should be data confirm
33dd8c9 
Signed-off-by: Arpit Goyal<[email protected]>
@cpg
Merge pull request #59 from agmps18/rails-4
53c691d 
Adding Back Debug Page
@agmps17
Localized string
655f998 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #61 from agmps18/rails-4
d5723a7 
Localized string
@agmps17
Allowing plugins to be added as a submenu of existing tab
32d796b 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #64 from agmps18/rails-4
a6ebb4f 
Allowing plugins to be added as a submenu of existing tab
@agmps17
Debug Page for production, typo as development
0e194db
@agmps17
Edited on master but not in this branch
53911e7
@cpg
Merge pull request #66 from agmps18/rails-4
ea75440 
Debug Page for production, typo as development
@agmps17
tab was already used, resolving naming error
0c14727
@cpg
Merge pull request #67 from agmps18/rails-4
0c532f0 
tab was already used, resolving naming error
@agmps17
Adding changes to allow migration in plugins. Rectifying uninstallati…
93c80b5 
…on error

Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #68 from agmps18/rails-4
f3f62f0 
Adding changes to allow migration in plugins. Rectifying uninstallation ...
@cpg
update app description, truncation. fixes #1397
f3e7057
@cpg
cleanup - removal of unused file
4735f12
@cpg
update opensearch icon to current logo
e46189d
@agmps17
Patch for double spinner icons
7168534 
Signed-off-by: Arpit Goyal <[email protected]>
@agmps17
Allowing name ans webapp id as attribute accesible
b406679
@cpg
Merge pull request #70 from agmps18/rails-4
6fecabb 
Rails 4
@agmps17
conflicting routes with webapps
cbb26db 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #71 from agmps18/rails-4
4688165 
conflicting routes with webapps
@agmps17
Repo changes
7b94834 
Signed-off-by: Arpit Goyal <[email protected]>
cpg and others added 24 commits June 16, 2014 03:24
@cpg
bundle update, using our the_for_rails, update .ruby-version
69597d0
@agmps17
Changes based on the generic conf
33c100b
@agmps17
New changes and merging branch
a2d5085
@agmps17
Introducing hda_access for apps using other kind of templates
69edf6f
@agmps17
Adding check for checkboxes bug 1451
3c23656 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #73 from agmps17/rails-4
90926c5 
Fixes for checkboxes on rails-4
@agmps17
be_true is renamed to be_truthy
3f3534d 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #74 from agmps17/rails-4
89c7ec4 
be_true is renamed to be_truthy
@agmps17
Removing webapps code, fix for bug 1398(duplicate spinner)
addeace 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #75 from agmps17/rails-4
5d3f5d4 
Removing webapps code, fix for bug 1398(duplicate spinner)
@tmkasun
RAILS_DEFAULT_LOGGER is deprecated, use Rails.logger.error instead
3618fb7
@cpg
Merge pull request #76 from tmkasun/rails-4_logger_fix
269d691 
 RAILS_DEFAULT_LOGGER is deprecated, use Rails.logger.error instead
@cpg
update bundle, use system bundler to package the gems properly
4451cb4
@cpg
Merge branch 'rails-4' of github.com:amahi/platform into rails-4
6f81782
@agmps17
solving bug 1451
fe21d88 
Signed-off-by: Arpit Goyal <[email protected]>
@cpg
Merge pull request #77 from agmps17/rails-4
18951e6 
solving bug 1451
@cpg
aggressive cleanup of gem artifacts not needed at run time. 300 to 40…
d814a2e 
…0% reduction in size
@cpg
Merge branch 'rails-4'
2a0fe0c 
Conflicts:
	.travis.yml
	plugins/040-apps/app/views/apps/_is_installed.html.slim
@agmps17
Adding migration for changing custom_options column to text type
ceb4ed7
@cpg
Merge pull request #80 from agmps17/rails-4
5ab3a17 
Adding migration for changing custom_options column to text type
@cpg
update .ruby-version and update schema.rb to the latest
3d2e045
@cpg
update bin stubs to rails 4
17a3577
@agmps17
Changes to adapt the bootstrap theme
597d61f
@agmps17
Changes to adapt bootstrap theme
d868008 
Signed-off-by: Arpit Goyal <[email protected]>
cpg added a commit that referenced this pull request Jul 4, 2014
@cpg
Merge pull request #82 from agmps17/bootstrap
acfea76 
Bootstrap framework updtes
@cpg cpg merged commit acfea76 into amahi:bootstrap Jul 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@agmps17 @cpg @tmkasun