Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: codler/Battery-Time-Remaining
base: v1.5
...
head fork: codler/Battery-Time-Remaining
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Aug 20, 2012
@codler Fix issue #13, a bug on battery icon in retina display 2639476
Commits on Aug 22, 2012
@guillaume-algis guillaume-algis Draw white shadow underneath menubar icon. Closes issue #5. 0144fb4
@guillaume-algis guillaume-algis Add French localization 208d662
@codler Merge pull request #16 from guillaume-algis/master
Draw white shadow underneath menubar icon
bc81145
@codler Remove duplicate build files and set Localizable.strings to UTF-16 3ce984b
@codler Change back to "BatteryCharged" a9113f4
Commits on Aug 24, 2012
Velines German localization 6e74477
@codler Merge pull request #18 from Velines/master
German localization
8af49ab
@codler Convert to UTF-16 13c1764
@c-alpha c-alpha Changed look to match old Apple battery gauge exactly.
Images are loaded only once at startup and cached.
5e259b1
@c-alpha c-alpha Changed look to match old Apple battery gauge exactly.
Images are loaded only once at startup and cached.
0fe0ba1
@c-alpha c-alpha Merge branch 'master' of https://github.com/c-alpha/Battery-Time-Rema…
…ining

Conflicts:
	Battery Time Remaining/AppDelegate.m
8d4a401
Commits on Aug 25, 2012
@codler Update change log 3740da1
@c-alpha c-alpha Fixed blurry battery icon on hi-re displays.
Added setting for switching parentheses around time remaining on and off.
Moved all settings (incl. "advanced") to a submenu.
Added German and French localizations for new menu items.
TODO: Swedish and Dutch localizations missing.
c129b54
@c-alpha c-alpha don't let the capacity bar get too small too quickly caa8293
@codler Merge pull request #19 from c-alpha/master
Updated look & feel
d42f37d
Commits on Aug 26, 2012
@codler Refactor 9102c77
@codler Fix "_NSWarnForDrawingImageWithNoCurrentContext" warning in log 6a60429
@Vinky41 Vinky41 Update Battery Time Remaining/fr.lproj/Localizable.strings
translation improved
fa00799
@codler Merge pull request #21 from Vinky41/patch-1
Update Battery Time Remaining/fr.lproj/Localizable.strings
de0c19d
@codler Refactor 2d7b8ed
Commits on Aug 27, 2012
@codler Correct spelling 3539871
@codler Update English and Swedish localization 7c9bd61
Velines Updated German localization 20a31fc
@guillaume-algis guillaume-algis As requested; Updated French localization 4741d37
@codler Merge pull request #25 from Velines/master
Updated German localization
7d174d7
@codler Merge pull request #27 from guillaume-algis/master
Updated French localization
f1ad823
@c-alpha c-alpha use setTemplate: to get white shadow when capacity bar is not red ff6259d
@codler Merge pull request #28 from c-alpha/master
Re-introduce white shadow using setTemplate:
73e8ada
@codler Fix reference image bug d28c0a2
@codler Change variable name e6c2da8
Commits on Aug 28, 2012
@codler check for updates switch 01c4f9f
@codler Show app version in menu b9fb586
Commits on Aug 29, 2012
@codler Update Dutch localization, thanks @mac-cain13 a0fa025
@codler Update Slovak localization, #34 80c2f80
@codler Update readme fc81961
@codler Append 512x512 icon 87662e4
Commits on Aug 31, 2012
@scruzphreak scruzphreak Update Readme.md
Fixed a couple of typos
c7c0e89
Michael Shulman Another edit to the readme 3483a0f
@codler Merge pull request #35 from scruzphreak/master
Fixed two typos in the readme
d2c535c
Commits on Sep 03, 2012
alamilar Added Polish Localization c5cc3e2
Commits on Sep 04, 2012
@codler Merge pull request #38 from alamilar/master
Added Polish localization
6a49d03
@codler Added Portuguese localization, thanks dvm 433e3d8
@codler Remove InfoPlist.strings 63e67e3
@codler Fix memory leaks cd8e05c
@codler Fix #20, translate notification title a0532db
@codler Fix #26, make powersource states translatable 78a51b4
@codler Update English and Swedish localization 872c07f
@codler Fix zero padding in time remaining left notification in localization 2f7f4ba
Commits on Sep 05, 2012
@codler Correct spelling 0ee3948
Commits on Sep 13, 2012
@codler Add license 5451fb2
Commits on Sep 25, 2012
@codler Added Simplified Chinese localization, thanks @zhangwen590 the great! 0ee45aa
@codler #11 New app icon provided by @dizel247 c7a415b
@codler Option + click for advanced mode dd1651e
@codler Updates menu info every 5 seconds when menu is open. 1cabf59
@codler Improved option + click 8dab232
@codler Fix #29, make "batteryCharged" icon black 4d0ce73
Commits on Sep 26, 2012
@codler Fix #22, state after reboot 28443a6
Commits on Oct 03, 2012
@codler Update readme 4150e24
@codler bump version 66215a6
Commits on Oct 06, 2012
@codler Correct date a872869
Commits on Oct 07, 2012
@codler Added Italian localization, #46 5272ded
@codler Update French localization, thanks @Vinky41 06d6bd6
@codler Prompt auto update 39456d5
@codler Update English and Swedish localization ba998c7
Commits on Oct 08, 2012
Velines Updated German localization 594f06d
@codler Merge pull request #48 from Velines/master
Updated German localization
a623120
@codler Refactor 734cedd
Commits on Oct 23, 2012
@codler Added Korean localization, thanks @justystyle 85a6e77
Commits on Nov 01, 2012
@codler Update readme b0d5112
Commits on Dec 21, 2012
@alexanderad alexanderad Add time since unplugged feature 901b4dd
Commits on Jan 06, 2013
@danielmartin danielmartin Spanish translation. 980f683
Commits on Jan 07, 2013
@codler Merge pull request #56 from danielmartin/spanish_translation
Spanish translation.
9e7e44e
@codler Convert to UTF-16 575831a
Commits on Jan 20, 2013
@codler Fix #57, change home url and update url 6d5ba87
@codler Update readme 89c8d64
Commits on Jan 27, 2013
@ericbroska ericbroska Add Russian l18n
- add Russian localization
  (both Localizable.strings and Credits.rtf)

Signed-off-by: Eric Broska <eric.broska@me.com>
b72267d
@ericbroska ericbroska Add missed localized value (Russian)
- translate the "%ld %% left" key
dca588f
Commits on Feb 05, 2013
@codler Merge pull request #58 from ericbroska/l18n
Add Russian l18n
6a32595
@codler Set as UTF-16 895e958
Commits on Apr 10, 2013
@danielmartin danielmartin Add option to display temperature in degrees Fahrenheit 4eb8f4d
Commits on Apr 30, 2013
@JohnnySlagle JohnnySlagle Added the option of white text time in the menu bar
I use the menu bar theme called Obsidian to make my menu bar black.  So I added a toggle with the option to make the time shown to the right of the battery white (the battery is automatically themed by Obsidian).

Signed-off-by: Johnny <Johnny.Slagle@gmail.com>
723ba5b
Commits on Jun 22, 2013
@codler Merge branch 'time-since-unplugged' of https://github.com/alexanderad…
…/Battery-Time-Remaining into alexanderad-time-since-unplugged
9ce99e5
@codler Fix previous merge commit c64def1
@codler Merge #62 320849b
@codler Fix previous merge commit. ef14d97
@codler Merge conflict #64 03bda33
@codler Fix previous merge commit 8e848bf
Commits on Jun 30, 2013
@codler Fix #51, option to hide icon and fix #55, option to show as per cent fa6e570
@codler Update readme ffb9d77
Commits on Jul 05, 2013
@codler Update readme and year 7d851b5
@codler Merge 2.0 80fb734
Commits on Jul 20, 2013
@frosas frosas Use a HTTP URL for the App Store link
Markdown doesn't seem to play well with the schema macappstore://
b5276c6
@codler Merge pull request #67 from frosas/patch-1
Use a HTTP URL for the App Store link
4c5ff94
Commits on Aug 04, 2013
@codler Update readme d519995
@codler Merge branch 'master' of https://github.com/codler/Battery-Time-Remai… f9452e8
Commits on Aug 20, 2013
@mlkh0225 mlkh0225 Added Traditional Chinese (Taiwan) language. 942f4d6
Commits on Sep 03, 2013
@codler Fix previous commit cfeb88d
@codler Fix wrong color on select and missing parenthesis on percentage view 299e073
@codler #65 See both time and percentage on status bar at the same time 401e49b
@codler Merge cherry-pick from 1.x 17f1bfc
@codler Update readme 4b60cf8
Commits on Sep 08, 2013
@Vinky41 Vinky41 Update Localizable.strings
Update with new information included in the version 2
f9a24a5
@codler Convert to UTF-16 451cc80
Commits on Sep 16, 2013
@mlkh0225 mlkh0225 Updated missing string in Traditional Chinese (Taiwan) localization. 6f345e8
Commits on Oct 23, 2013
@airdrummingfool airdrummingfool Fixing the app forces activation of the discrete GPU on newer Macs. edc7e8d
@codler Merge pull request #73 from mlkh0225/master
Updated missing string in Traditional Chinese (Taiwan) localization.
6671571
@codler Merge pull request #75 from airdrummingfool/fix-graphics-switching
Fixing the app forces activation of the discrete GPU on newer Macs.
2390b2c
@codler Update readme 6520839
Commits on Oct 27, 2013
Velines Updated German translation 913ba39
Commits on Oct 29, 2013
@codler Merge pull request #80 from Velines/master
Updated German translation
2ab697d
Commits on Jan 02, 2014
@codler #79 Notifications while charging ddb2536
@codler Update readme and project files b4d47a5
Commits on Oct 17, 2014
@codler Added support for OS X 10.10 Yosemite 53270d5
Commits on Oct 24, 2014
@codler Fix highlightning 8288b4d
Commits on Oct 28, 2014
@codler Fix dark mode 80f351b