HomePhabricator

Merge branch 'master' into feature/T124803/browser-nav

Authored by Fjalapeno.

Description

Merge branch 'master' into feature/T124803/browser-nav

Merged Changes

CommitAuthorDetailsCommitted
e91dcfb34843 BGerstle-WMF
Merge pull request #441 from wikimedia/feature/T125154/move-tweaks-to-settings 
Feb 2 2016
9c29c0ccad55 BGerstle-WMF
Merge pull request #438 from wikimedia/editButtonUpdate 
Feb 2 2016
c6bec9294878Mhurd
Changed "Tweaks" to "Developer settings". 
Feb 2 2016
720605975da2 BGerstle-WMF
Merge pull request #434 from wikimedia/feature/T124484/feed-style-updates 
Feb 2 2016
5898c1692964 BGerstle-WMF
Merge pull request #442 from pra85/patch-1 
Feb 2 2016
5e199c126240Prayag Verma
Fix typo in docs/working-with-ruby.md 
Feb 2 2016
be08df876112montehurd
Merge pull request #437 from wikimedia/feature/cancel-sharing-button/T124818 
Feb 2 2016
b85b8fe83c04Mhurd
Uncrustify. 
Feb 2 2016
51f8146d1e67Mhurd
Moved tweaks from shake to settings. 
Feb 2 2016
50b35de8cd8aFjalapeno
Merge pull request #433 from wikimedia/tabbarShadow 
Feb 2 2016
48e76c998aceMhurd
Replaced some properties with setters per feedback. 
Feb 2 2016
36d8695ce8bf Nirzar
Updated the locked pencil icon 
Feb 1 2016
b48e14140792 Nirzar
Fixed syntax format 
Feb 1 2016
fff4a87e09cd Nirzar
CSS tweaks * iOS style edit pencil * iOS style disabled edit pencil * Specific… 
Feb 1 2016
bd4f36132dbeMhurd
Uncrustify. 
Feb 1 2016
2d109f3afc9bMhurd
Use new setLocalizedDateFormatFromTemplate. 
Feb 1 2016
c9c611603093Mhurd
Tweaks from Nirzar to fonts. 
Feb 1 2016
2762f6deb962Mhurd
Use wmf_customGray for explore header and footer text. 
Feb 1 2016
fc3fea72d456Mhurd
Use capitalization for relative date string for 'Continue reading'. 
Feb 1 2016
74d6aef022bdMhurd
Rename some 'home' methods. 
Feb 1 2016
5c5e186ae0e0Mhurd
Uncrustify. 
Feb 1 2016
2721aed4e5a3Mhurd
Update explore headers styling. 
Feb 1 2016
03cdd513ee7a BGerstle-WMF
add cancel button to share view 
Feb 1 2016
6afd6ee1e8df Nirzar
Converted one asset to PDF 
Feb 1 2016
79be9098ca9c Nirzar
Tabbar Visual Design Update 1. Added shadowImage for UItabbar 2. Added selected… 
Jan 30 2016