public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5070 commits 2 branches 0 tags 863 MiB
Commit graph

725 commits

Author SHA1 Message Date
Samuel Clay
c19e068262 Merge branch 'master' of github.com:samuelclay/NewsBlur into social 
* 'master' of github.com:samuelclay/NewsBlur:
  Truncating feed title in trainer dialog.
  Adding French review to press page.

Conflicts:
	media/js/newsblur/reader/reader_classifier.js
 2012-05-02 12:08:08 -07:00
Samuel Clay
a9bdc7e3ad Adding French review to press page. 2012-05-02 09:22:38 -07:00
Samuel Clay
aeb7accab4 Editing of replies. 2012-05-01 18:00:54 -07:00
Samuel Clay
1736c35b2f Cleanup on social beta signup. Feedback from @jwegener. 2012-04-30 17:15:43 -07:00
Samuel Clay
1e44430698 Merge branch 'master' into social 
* master:
  Adding French review to press page.
 2012-04-25 12:20:21 -07:00
Samuel Clay
121adb1cb2 Adding French review to press page. 2012-04-25 12:20:12 -07:00
Samuel Clay
7f280920ee Adding tip to /reader/add_url in api. Closes #49. 2012-04-24 12:17:30 -07:00
Samuel Clay
139761a148 Adding share story menu option to story context menu. Took all day. 2012-04-24 10:38:23 -07:00
Samuel Clay
109decc5d0 Merge branch 'master' into social 
* master:
  Starred story titles, even if it kills us.
  Chucking ntpd in favor of bluntly recalibrating time on VPSs.
  Adding Robin Good press.
 2012-04-23 15:38:54 -07:00
Samuel Clay
34ed4d3efe Adding Robin Good press. 2012-04-23 10:32:05 -07:00
Samuel Clay
ebef3437a6 Styling tags and stars. 2012-04-22 13:24:14 -07:00
Samuel Clay
45b2b06c10 Adding share rainbow to story titles. Thanks Talha Mansoor (@talha131) 2012-04-21 21:50:27 -07:00
Samuel Clay
74bb4780ea Adding dashboard date and auto-highlighting new interactions, to be cleared on dashboard view. 2012-04-21 18:20:49 -07:00
Samuel Clay
1f18f0e8dc Merge branch 'master' into social 
* master:
  Updating bookmarklet. Showing when the bookmarklet is broken, and fixes bugs with enumerable prototype chain fucking.
 2012-04-21 17:31:01 -07:00
Samuel Clay
4ef7bf9827 Updating bookmarklet. Showing when the bookmarklet is broken, and fixes bugs with enumerable prototype chain fucking. 2012-04-21 17:15:45 -07:00
Samuel Clay
bef8fbd6ee Fixing broken cancel button on send email dialog. 2012-04-20 08:39:40 -07:00
Samuel Clay
2205814f2a Adding public user activity to social profile. 2012-04-19 19:09:31 -07:00
Samuel Clay
01e4827d80 Stubbing in broken recommended users. 2012-04-19 12:46:58 -07:00
Samuel Clay
dbcfaf4be5 Fixing template next/previous buttons. 2012-04-18 22:17:29 -07:00
Samuel Clay
1955dca844 Shortening activities/interactions to 4, to make room for coming user recomendations table. Also speeding up favicons. 2012-04-18 22:04:13 -07:00
Samuel Clay
f48e6d6999 Preventing dupe starred story activities. 2012-04-17 10:45:21 -07:00
Samuel Clay
aa42f098cf Adding a ton of activities. Fixing numerous bug saround interactions. 2012-04-16 11:21:52 -07:00
Samuel Clay
3f991ca2a0 Automatically showing interactions/activities modules when new info is made, even if they are empty to begin with. 2012-04-12 17:41:33 -07:00
Samuel Clay
3f0c9b3cfb Calculating stories shared for dashboard statistics graph. 2012-04-12 13:37:19 -07:00
Samuel Clay
38b64999be Moving activities and features module. Fixing bug around interactions when following self. 2012-04-12 11:43:36 -07:00
Samuel Clay
4612bedb49 Adding paging to interactions and activities on dashboard. 2012-04-12 11:18:56 -07:00
Samuel Clay
4cf027d135 Typos 2012-04-11 17:21:33 -07:00
Samuel Clay
ce18a4eab7 Adding beta email. Sending out a slow trickle of invites... 2012-04-11 17:13:54 -07:00
Samuel Clay
15e08e653a Hooking up starred stories and new subscription activities. 2012-04-11 15:53:53 -07:00
Samuel Clay
1c245f1e0a Clicking on a comment/reply in interactions takes you to it. Also upgrading backbone.js. 2012-04-11 15:21:03 -07:00
Samuel Clay
451485d32e Splitting interactions into public/private interactions and activities. 2012-04-11 12:14:18 -07:00
Samuel Clay
b9d8b91f6d Showing interactions in module. Adding interactivity. 2012-04-10 18:24:57 -07:00
Samuel Clay
3f7810287b Refactoring features module and adding interactions module + model. Stubbed in interactions module. 2012-04-09 17:20:47 -07:00
Samuel Clay
3c31c0c6a6 Merge branch 'master' into social 
* master:
  Adding MongoDB logging for debug.
  Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there.

Conflicts:
	media/css/reader.css
	templates/base.html
	utils/json_functions.py
 2012-04-06 18:35:40 -07:00
Samuel Clay
2ab37d20e1 Adding MongoDB logging for debug. 2012-04-06 18:28:26 -07:00
Samuel Clay
5d3c42d8ab Logging the crap out of the social connect popup. 2012-04-06 15:39:11 -07:00
Samuel Clay
eb9bb2c1bd Adding invite request. 2012-04-05 13:51:08 -07:00
Samuel Clay
fd0d6f8491 Merge branch 'master' into social 
* master:
  Better logging for socket.io. Giving standard users the pulsating real-time spinner.
  Only checking raw parsed hub address 1 in 10 times.

Conflicts:
	templates/reader/feeds.xhtml
 2012-04-03 22:02:18 -07:00
Samuel Clay
c24c829e58 Better logging for socket.io. Giving standard users the pulsating real-time spinner. 2012-04-03 22:01:12 -07:00
Samuel Clay
4ee3a6c8c4 Merge branch 'master' into social 
* master:
  Showing real-time pubsub status on user dashboards. Opening up real-time for everybody.
  Adding real-time connection counts to logs.
 2012-04-02 18:49:34 -07:00
Samuel Clay
61f2ced74b Showing real-time pubsub status on user dashboards. Opening up real-time for everybody. 2012-04-02 18:48:41 -07:00
Samuel Clay
5f34c24c2b Styling and finishing the social page original view's header. 2012-03-29 19:01:04 -07:00
Samuel Clay
67ea2452a7 Uniqifying profiles. Small cleanup. 2012-03-20 16:46:38 -07:00
Samuel Clay
6c4272a06b Updating training counts when choosing feeds. 2012-03-19 19:18:19 -07:00
Samuel Clay
d2cb186d56 Following and unfollowing from intro. 2012-03-19 16:35:56 -07:00
Samuel Clay
2200aa282a Subscribe to blog during intro. 2012-03-19 15:46:59 -07:00
Samuel Clay
8f0afbb7c2 All setup module items now disappear/appear or show a Done title appropriately. 2012-03-19 14:15:38 -07:00
Samuel Clay
b4acea734b Showing follow button, restyling taskbar buttons, fixing issues around previewing. 2012-03-15 11:33:00 -07:00
Samuel Clay
de4255c3f2 Merge branch 'master' into social 
* master:
  Fixing iphone page by moving JS to bottom of page.
  Adding Nokia MeeGo Web Feeds mobile app.
 2012-03-14 13:42:47 -07:00
Samuel Clay
99c943b07b Fixing iphone page by moving JS to bottom of page. 2012-03-14 13:27:52 -07:00