Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jakiestfu/Bits
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: xoofoo-project/Bits
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 32 files changed
  • 3 contributors

Commits on Jul 13, 2014

  1. Working with UTF-8 files

    window.btoa and .atob only works with ascii files. Used base64.js as
    replacement to encode strings..
    BitOfGold committed Jul 13, 2014
    Copy the full SHA
    bd340eb View commit details

Commits on Jul 14, 2014

  1. Select title and snippet of latest version of Bit

    previous version selected the latest version number, but not the latest
    version's title.
    BitOfGold committed Jul 14, 2014
    Copy the full SHA
    501862d View commit details

Commits on Mar 1, 2015

  1. .htaccess file change, PHP code cleanup, config.php no longer part of…

    … repo
    Francis Kim authored and Francis Kim committed Mar 1, 2015
    Copy the full SHA
    9cee042 View commit details
  2. CSS fixes

    Francis Kim authored and Francis Kim committed Mar 1, 2015
    Copy the full SHA
    f6711ff View commit details
  3. UTF-8 for database

    Francis Kim authored and Francis Kim committed Mar 1, 2015
    Copy the full SHA
    2b2a01b View commit details

Commits on Jun 6, 2015

  1. Merge pull request #1 from BitOfGold/master

    change by BitOfGold
    krisxoofoo committed Jun 6, 2015
    Copy the full SHA
    db9ba85 View commit details
  2. Merge pull request #2 from franciskim/master

    change by franciskim
    krisxoofoo committed Jun 6, 2015
    Copy the full SHA
    c654732 View commit details
165 changes: 2 additions & 163 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,163 +1,2 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results
[Dd]ebug/
[Rr]elease/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
.builds
*.dotCover

## TODO: If you have NuGet Package Restore enabled, uncomment this
#packages/

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish

# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML



############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

# Mac crap
.DS_Store
/public/app/config/
.idea
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ Bits Editor is your personal playground to develop in HTML, CSS, and Javascript,
* User: demo
* Pass: demo

## Featurse
## Features

* HTML, CSS, and Javascript Editors
* Hotkeys/shortcuts
2 changes: 1 addition & 1 deletion public/.htaccess
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ RewriteBase /

RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule .* index.php?/$0 [PT,L,QSA]
RewriteRule .* index.php?/$0 [PT,L,QSA]
Original file line number Diff line number Diff line change
@@ -86,5 +86,3 @@
)
)
);

?>
Loading