I was merging the branch that removed / consolidated bunch of duplicate JSP files (corporate-ui-cleanup).
In the meantime in master, some minor UI changes were made to these files whose content was now elsewhere.
Quick trick how to resolve it fast:
Show branch # CineplexB2B $ git show-branch ! [bb-database-cleanup] Loading data with XML only: no constraints and tax_id (unused field) nullable ! [bb-gradle-build] Merge branch 'master' into bb-gradle-build * [bb-master] Merged in the last 5 days changes ! [corporate-ui-cleanup] Merged in the last 5 days changes ! [master] Merged in the last 5 days changes ----- - [bb-gradle-build] Merge branch 'master' into bb-gradle-build ---- [bb-master] Merged in the last 5 days changes +*++ [bb-master^2] CPLXB2B-562, usageInfo/internalUsageInfo mapping in CFI +*++ [bb-master^2^] return order goes all the way to NEW: replaced SetPaymentGroupAmount, added ReturnFee calculator, added reusable jsp fragments for sales order pages +*++ [bb-master^2~2] Styling change to avoid disappearing links inside Terms and Conditions +*++ [bb-master^2~3] Dealing with consequences if INTERNAL split to INTERNAL_TRANSFER and INTERNAL_PURCHASE ---- [bb-master^2~4] Merge remote-tracking branch 'origin/master' into uat2-deploy ---- [bb-master^2~4^2] Merge branch 'master' of luke:cineplex-b2b +*++ [bb-master^2~4^2^] merged changes - fixed conflict +*++ [bb-master^2~4^2~2] CPLXBTOB-557 - fixed amount column to show proper currency ---- [bb-master^2~4^2~3] Merge branch 'master' of twgit@luke:cineplex-b2b.git +*++ [bb-master^2~4^2~4] CPLXBTOB-484 - fixed the spacing and comma issues +*++ [bb-master^2~5] Reverted 4d512ed - issue with recalculate. Must be solved selectively via Javascript +*++ [bb-master^2~6] Spacing in header see also version with --current
# Test if it is sourced or not if [[ $0 != .*bash ]]; then echo Please source it: . $0 exit 1 fi res=`gradle --version >/dev/null 2>&1; echo $? ` if [[ $res == "0" ]]; then echo Have gradle: `which gradle` gradle --version else export GRADLE_HOME=~/opt/gradle export PATH=$PATH:$GRADLE_HOME/bin echo No Gradle, adding - `which gradle` gradle --version fi
Suddenly I started to see all apps auf Deutsch:
The cause was by mistake selecting additional language in Properties -> Internationalization (Österreichisches Deutsch) and the system added it to the list as language #1.
Those programs that are localized, picked it up ….
Here is how that list looks like after reorder :-) I care only for the first 11 languages anyway ;-)
I have been experiencing issues with Quicklook (press Space on file in Finder or Pathfinder) for some time: it took several second, sometimes 10-15 to show content of simple 1K large property file.
It turned out that on of the QuickLook plugins, installed originally way back in Leopard and brought ahead with TimeMachine restores could have been the reason: the QLStephen.
For more on that plugin see:
http://whomwah.github.com/qlstephen/ https://github.com/whomwah/qlstephen To remove the plugin, go to ~/Library/QuickLook and delete the file (it is the bundle) QLStephen.qlgenerator.
Installed GVM from:
http://gvmtool.net
~ $ curl -s get.gvmtool.net | bash Thanks for using _____/\\\\\\\\\\\\__/\\\________/\\\__/\\\\____________/\\\\_ ___/\\\//////////__\/\\\_______\/\\\_\/\\\\\\________/\\\\\\_ __/\\\_____________\//\\\______/\\\__\/\\\//\\\____/\\\//\\\_ _\/\\\____/\\\\\\\__\//\\\____/\\\___\/\\\\///\\\/\\\/_\/\\\_ _\/\\\___\/////\\\___\//\\\__/\\\____\/\\\__\///\\\/___\/\\\_ _\/\\\_______\/\\\____\//\\\/\\\_____\/\\\____\///_____\/\\\_ _\/\\\_______\/\\\_____\//\\\\\______\/\\\_____________\/\\\_ _\//\\\\\\\\\\\\/_______\//\\\_______\/\\\_____________\/\\\_ __\////////////__________\///________\///______________\///__ Will now attempt installing... Looking for a previous installation of GVM... Looking for JAVA_HOME... Validating JAVA_HOME... Looking for unzip... Looking for curl... Installing gvm scripts... Create distribution directories... Create candidate directories... Download script archive... Extract script archive... Install scripts... Make init script executable... Prime config file... Attempt update of bash profiles... Updated existing /Users/miro/.bash_profile Updated existing /Users/miro/.profile Updated existing /Users/miro/.bashrc Attempt update of zsh profiles... Created and initialised /Users/miro/.zshrc Clean up local variables... All done! Please open a new terminal, or run the following in the existing one: source "/Users/miro/.gvm/bin/gvm-init.sh" Then issue the following command: gvm help Enjoy!!! Using # binsh $ gvm current Using: groovy: 2.0.6 grails: 2.2.0 griffon: 1.1.0 gradle: 1.3 vertx: 1.3.0.final Fix for zsh # http://blog.andresteingress.com/2012/12/14/gvm-the-groovy-environment-manager/
Finally a todo/task/project management system that is very good fit.
Here is why:
is pretty visually modern and dynamic UI has Web back-end (usable from Linux VM) has decent iPhone app allows checklists (multiple) allows color coding Markdown support ecosystem There is Gmello that allows create card from GMail, plus few others that seem to bridge the gap between Evernote, System XYZ and Trello
http://trello.com
Courtesy of Fog Creek / Joel Spolsky’s company
OK, NERDTree plugin IS great, but this is awesome.
Alloy made custom version of MacVim with file drawer: see https://github.com/alloy/macvim/wiki/Building
It is available in source - so you have to compile it yourselves. But if you do not want to, I did it and the binary is attached, built with these features:
./configure –with-feature=huge –enable-rubyinterp –enable-pythoninterp –enable-perlinterp –enable-cscope
Archive is attached: MacVim.zip
If you want to get my set of plugins and customizations, it is on GitHub: - https://github.com/radegast/dotvim,
After update, the ST2 started to complain about missing git command.
Finding out Git on MBP:
platform $ which git git is /usr/bin/git git is /usr/local/bin/git platform $ git --version git version 1.7.7.5 (Apple Git-26) platform $ /usr/bin/git --version git version 1.7.7.5 (Apple Git-26) platform $ /usr/local/bin/git --version git version 1.7.3.2 Fix the the Package file in /Users/miro/Library/Application Support/Sublime Text 2/Packages/Git - Git.sublime-settings (it is JSON file)