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: liweinan0423/publify
base: master
...
head fork: gnowxilef/publify
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Sep 05, 2013
@mukaer mukaer Adds config TimeZone.
31f2738
Commits on Sep 11, 2013
@fdv fdv Improves the author page
* Displays the user avatar if it exists.
* Only load the 10 latest articles
* Paginate the other articles

Issue #231

TODO:

* Include the 10 latest notes (need to define how)
* Only display the complete bio on the first page.
* On the other page, display the first paragraph of the bio, the photo and the articles.
* Mix articles and contents like on the home page (make it optional?)
1fd27ea
@fdv fdv Fixes conflict
79fa967
@gregmolnar gregmolnar upgrade Rails to 3.14
4185daf
Commits on Sep 12, 2013
@fdv fdv Refactoring profile and user to make them user a resource for avatar …
…instead of giving links to the picture.

Makes much more sense this way even though I have to add a field in the database which I tried to avoid. But too much serialized options can sometimes be too much.

Also add specs because that controller lacked love.

Issues #230 and #231.
52c4b33
@yaf yaf User can access to some dashboard part, or not
Don't break demeter's law.
99c81c9
Commits on Sep 13, 2013
@yaf yaf Don't call google search in dashboard if env is dev
cf9f952
Commits on Sep 14, 2013
@yaf yaf Remove duplication about perpage from blog
871e814
Commits on Sep 15, 2013
@yaf yaf Clean spec and remove specs on view
498030b
@yaf yaf Add published at to order article
c13ebcd
@fdv fdv Release 7.0 stable
e1c463c
@fdv fdv Merge branch 'master' of github.com:fdv/publify
a4defc2
Commits on Sep 17, 2013
@randomecho randomecho Update links on README and general copyedits [ci skip]
- Should be called "Simplified Chinese" in language list
- Change link to clone Publify to use the HTTPS version
  as the git link does not generate a link under Markdown
- Basic theme list should only list three items, the extra
  bit about screenshots serves better, neater as addendum.
- Link to FAQ hosted on GitHub wiki has moved
1191136
@yaf yaf Merge pull request #244 from randomecho/copyedit-readme201309
Update links on README and general copyedits
3af8d1d
@randomecho randomecho Fix lists, links in Bootstrap theme README [ci skip]
- Sub-lists need indent to properly show on README render
- Update the heading numbers to match TOC
- Updates links to Bootstrap after they moved from Twitter
- List under Views section should only list two items,
  move the other bullets out into separate Exceptions list
9ae29e0
Commits on Sep 18, 2013
@fdv fdv Merge pull request #245 from randomecho/copyedit-readme-bootstrap
Fix lists, links in Bootstrap theme README [ci skip]
71d1f45
Commits on Sep 19, 2013
@fdv fdv Fixes a bug where failing at publishing a note would redirect to Admi…
…n::ContentController#edit and crash the application instead of redirecting to Admin::NotesController#edit as it should. Issue #247.

Makes Admin::NotesController inherits from Admin::BaseController like Admin::ContentController and Admin::PageController.

Moves private method parse_date_time from Admin::ContentController to Admin::BaseController to avoid code duplication.
e44cd45
@fdv fdv Fixes a bug where failing at publishing a note would redirect to Admi…
…n::ContentController#edit and crash the application instead of redirecting to Admin::NotesController#edit as it should. Issue #247.

Makes Admin::NotesController inherits from Admin::BaseController like Admin::ContentController and Admin::PageController.

Moves private method parse_date_time from Admin::ContentController to Admin::BaseController to avoid code duplication.
f0b9bc8
@fdv fdv Merge branch 'master' of github.com:fdv/publify
5374f7b
@fdv fdv Merge branch 'bugfix_7.x'
63b417d
@randomecho randomecho Fix codeblock in Bootstrap README to use Markdown indent
26a0c1d
@fdv fdv Adds a migration to fix buggy notes an drafts introduced by an earlie…
…r version of Publify.

Issue #246.
8d3436e
@fdv fdv Merge pull request #250 from fdv/bugfix_7.x
Adds a migration to fix buggy notes an drafts introduced by an earlier v...
0e9b6cb
@alepore alepore Fix typo on required Rails version
8508707
Commits on Sep 20, 2013
@yaf yaf Merge pull request #251 from alepore/patch-1
Fix typo on required Rails version
9128261
@yaf yaf Merge pull request #249 from randomecho/mdfix-readme-bootstrap
Fix codeblock in Bootstrap README to use Markdown indent
3eff965
@yaf yaf Seems that schema.rb was not commit last time...
53a0ebc
Commits on Sep 21, 2013
@yaf yaf Made notes more similar to articles
8bb5524
Commits on Sep 23, 2013
@yaf yaf Revert "Clean feedback controller"
This reverts commit b81f31e.
eb5f126
@fdv fdv Fixes comment creation from within the admin.
Maybe this should move to admin/content since it's more content?

Solves #252.
34205cd
@fdv fdv Merge pull request #253 from fdv/bugfix_7.x
Fixes comment creation from within the admin.
ea60e15
@fdv fdv Adds changelog and version number for 7.1
9d4fabb
Commits on Sep 24, 2013
@yaf yaf Merge pull request #242 from gregmolnar/rails_upgrade
upgrade Rails to 3.14
4bebd8b
Commits on Sep 25, 2013
@yaf yaf Improve helper
163f998
@yaf yaf Clean helper about twitter config test
618426e
Commits on Sep 26, 2013
@yaf yaf Clean spec around default layout view
9022318
@yaf yaf Clean note spec and refactoring around twitter message
954216b
@yaf yaf Remove some unnecessary code from note model
2cb2fb3
@yaf yaf Remove helper method to use content_for
I think it's a better way to do this kind of stuff (build a header title
and put it elsewhere than in yield place)
0c38a45
Commits on Oct 01, 2013
@yaf yaf Fix some strange text filter work
ce9c764
Commits on Oct 02, 2013
@yaf yaf Fix content for heading style
fc12a91
@yaf yaf Clean account page and start config locale.
Start to use standard config/locale/yml file format for I18n
Clean helper with a content_for yield usage
8d192b4
@yaf yaf Fix push_to_twitter bug and clean factory
747fc25
Commits on Oct 03, 2013
@randomecho randomecho Admin login is looking for en.yml keys for placeholder text
English i18n YAML file is missing keys found in the
French. As a result, the admin login screen is showing
HTML errors from placeholder text that does not translate.
2aab5cb
Commits on Oct 04, 2013
@yaf yaf Merge pull request #258 from randomecho/i18n-admin-login-placeholders
Admin login is looking for en.yml keys for placeholder text
b58a2ab
@yaf yaf Add a test case with a new method about twitter message length calcul
f6aa538
@yaf yaf Fix twitter message length
677da43
Commits on Oct 05, 2013
@yaf yaf Twitter link limit
668931f
Commits on Oct 06, 2013
@basmoura basmoura create translation file for pt-BR
4d3d2af
@yaf yaf Merge pull request #259 from basmoura/master
create translation file for pt-BR
4249f1e
Commits on Oct 07, 2013
@yaf yaf Clean accounts view
24a86b5
@yaf yaf Add missing en keys
04f422c
@yaf yaf Move lang to locales
2a5b439
@yaf yaf Administraiton layout label changes
Move from lang to config
19d6ebb
@yaf yaf Change categories new view
Move lang to locales (more standard way for rails)
f68ff41
@yaf yaf move lang to locals for account revover and signup pages
2d61dfd
@yaf yaf Move from lang to locales of admin cache index page
d4e8caf
@yaf yaf Move lang to locales for new cat.
Start clean content main page
09d92ee
@basmoura basmoura adds more translations for pt-BR
24922bd
@yaf yaf Merge pull request #261 from basmoura/master
adds more translations for pt-BR
4a23da1
@yaf yaf Clean helper and content form
3f95bb9
Commits on Oct 08, 2013
@yaf yaf Move from lang to locales for content form
6755f61
@yaf yaf Move content index from lang to locales
c733eb7
@basmoura basmoura adds more translations for pt-BR
e95b4c2
Commits on Oct 09, 2013
@yaf yaf Merge pull request #262 from basmoura/master
adds more translations for pt-BR
1a6c6da
@yaf yaf Move lang to locale for comment part of dashboard
4fe0acb
@yaf yaf Move from lang to locale for inbound dashboard part
05e3141
@yaf yaf Move lang to locale for dashboard overview part
5a65699
@yaf yaf Fix specs around dashboard link check
cb166f6
@yaf yaf Clean dashboard, move lang to locales
308590a
@basmoura basmoura adds more translations for pt-BR
93e9769
@yaf yaf Fix specs
04feca3
Commits on Oct 10, 2013
Marc Pelteret Updated Gems source and prototype_legacy_helper source.
868f5c0
@yaf yaf Merge pull request #263 from basmoura/master
adds more translations for pt-BR
a37e414
@yaf yaf Merge pull request #264 from MarQ-ZA/patch-1
Updated Gems source and prototype_legacy_helper source.
0659743
Commits on Oct 12, 2013
@fdv fdv Fixes profiles rendering that would crash despite being tested.
Calling render_views should be done in all controller specs to ensure that something does not crash, otherwise, errors in the .erb files won't raise (just like now).
3538949
Commits on Oct 13, 2013
@yaf yaf Move lang to locale
e5558ee
Commits on Oct 14, 2013
@yaf yaf Fix dashboard draft
c369ff8
@yaf yaf move lang to locale for feedback button
db024b8
@yaf yaf Move lang to locale for feedback
42432f5
@yaf yaf Remove view test. That fail on special themes
Test views can reduce personalisation capability for special themes ! We
don't need to test view like this.

Perhaps we can test only for default themes ?
38c4982
@yaf yaf Move lang to locale for article feedback part
8810556
@yaf yaf Fix user profile avatar on his page
638b519
@yaf yaf Fix user profile avatar on his page
74b9a62
Commits on Oct 15, 2013
@yaf yaf Move lang to locales for feedback index
095c71b
@yaf yaf Move lang to locale for pages form
bbe4e62
@yaf yaf Move lang to locale for pages index
5b96c7a
@yaf yaf Move lang to locale for post types new
762484f
@yaf yaf Move lang to locale (and refactor) resources view
ff4d6c5
Commits on Oct 16, 2013
@yaf yaf Move lang to locale for destroy shared page
3c9e7a7
@ook ook get rid of prototype/scriptaculous files
cc0a312
@ook ook Prepare jquery gems
171298a
@ook ook Ignore sqlite dbs files
c3ef18f
@ook ook Result of 'rails generate jquery:install' since we don't use asset pi…
…peline yet
73fd569
@ook ook declare jquery front files
e376811
@ook ook Remove old calendar_date_select
8f93b27
@ook ook Apply gem changes to heroku
142a21d
@ook ook Add bootstrap, jquery-ui and convert Element.toggle to bootstrap coll…
…apse
929afe2
@ook ook Fix some link_to_remote + form_to_remote. Add Form.spinnable :remote …
…=> true behavior
1a36690
@ook ook Kick out Growler (proto), welcome Gritter (jquery)
532d323
@ook ook WIP autosave
44f2a3a
@ook ook WIP, need asset_pipeline
d2c4d6f
@ook ook WIP move to assets pipeline
472e375
@ook ook Use Rails asset-pipeline. Ok for front
6c15699
@ook ook Remove bootstrap files, use the bootstrap-sass gem instead
bf174c6
@ook ook Separate quicktags JS in his own file, include it through the asset p…
…ipeline in publify_admin.js
b8808ab
@ook ook Remove administration.js which is now empty (was only hooks, put in a…
…dmin_publify, and quicktags verbatim
b086547
@ook ook Fix feedback admin view, may miss some js
c28cf66
@ook ook Replace calendar_date_picker slutty plugin for Jquery datepicker. Not…
… as fun, but UJS
06fbd98
@ook ook Remove form_remote for now
449ed62
@ook ook FIXME need to convert these two calls to jquery.ui.draggable widgets
fadf85a
@ook ook typographic theme make prototype call. Just comment them: FIXME this …
…themes can't work right now
2c4d517
@ook ook Certainly broke password protected articles
84b93ec
@ook ook update rspec for backend
0c912ae
@ook ook Fix back calendar in admin
a37190d
@ook ook Certainly a relic from a inplace editor. Be ready to add best_in_plac…
…e gem
3855680
@ook ook Hu ho… accounts has its own layout
0cb8edc
@yaf yaf add time format to locale
483c99e
Commits on Oct 29, 2013
@yaf yaf Move seo index from lang to locale
a4dc69f
Commits on Nov 08, 2013
@fdv fdv Fixes CSS issues that came after the switch to assets pipelining.
We need to bring our own bootstraps because we're using cutoms version of the lib (reason why we have the less files in /doc/), so we can't rely on saas-botstrap.
fe23e29
@fdv fdv Fixes Javascript issues in the main layout
2d5b959
@fdv fdv Fixes a bug where the redirects would not be displayed in the right o…
…rder
b3bdd3a
@fdv fdv Brings the simple editor back
2cbb5b3
@hobofan hobofan added Blogger importer
860ce88
Commits on Nov 09, 2013
@fdv fdv Merge pull request #267 from hobofan/master
added Blogger importer
9eaf50b
@yaf yaf Merge branch 'add_config_timezone_2' of github.com:mukaer/publify int…
…o mukaer-add_config_timezone_2

Conflicts:
	spec/views/articles/read_spec.rb
c7ba3fe
Commits on Nov 12, 2013
@yaf yaf Move lang to config for permalinks
9f187c1
Commits on Nov 14, 2013
@yaf yaf move lang to locale for seo titles
f46e29e
Commits on Nov 21, 2013
@apsheronets apsheronets I'm so happy cause you guys use config/locales
fd1c916
@apsheronets apsheronets I haven't twitter but this message presents anyway
2a43447
@yaf yaf Merge pull request #286 from apsheronets/master
I'm so happy cause you  guys use config/locales
6547c61