Commit Graph

7003 Commits

Author SHA1 Message Date
Alexis Degrugillier
450df54d81 Merge branch 'stats' of https://github.com/aledeg/FreshRSS into stats
Conflicts:
	app/Controllers/statsController.php
	app/Models/StatsDAO.php
	app/i18n/en.php
	app/i18n/fr.php
	app/layout/aside_stats.phtml
	app/layout/header.phtml
	app/views/index/stats.phtml
	app/views/stats/idle.phtml
	app/views/stats/index.phtml
	app/views/stats/main.phtml
2014-06-15 12:20:57 -04:00
Alexis Degrugillier
60fe99344e Refactor and formatting 2014-06-15 12:13:33 -04:00
Alexis Degrugillier
e9cee8cc20 Fix syntax 2014-06-15 12:05:21 -04:00
Alexis Degrugillier
d9f570a84d Refactor idle feed stats 2014-06-15 12:05:21 -04:00
Alexis Degrugillier
181fcd9889 Refactor statistics
I made a new controller to handle statistics. The old statistics have been moved in that controller and a new action has been added to display idle feeds. I also added a menu in the left panel to navigate between the statistics pages.
See #90
2014-06-15 12:05:21 -04:00
Marien Fressinaud
09602acc5f Add two wrappers (_t() and _i())
- _t() is a wrapper for Minz_Translate::t()
- Improve coding style of Translate.php
- _i() is a wrapper for FreshRSS::icon()
- queries.phtml shows how they work
- It is a lot easier to read files with these functions :)
2014-06-15 17:49:23 +02:00
Alexis Degrugillier
177b398784 Fix syntax 2014-06-15 11:48:08 -04:00
Marien Fressinaud
81e4638f5a Merge branch 'dev' of github.com:marienfressinaud/freshrss into dev 2014-06-14 22:52:55 +02:00
Marien Fressinaud
9c931008f9 Change query icon
- Menu button is a down arrow
- Bookmark icon has moved near of "add a query"

See https://github.com/marienfressinaud/FreshRSS/pull/498
2014-06-14 22:51:39 +02:00
Marien Fressinaud
635505ecce Merge pull request #518 from aledeg/wording
Wording
2014-06-14 17:59:22 +02:00
Alexandre Alapetite
ab233dc2d2 Solve bug for passwords with special characters
https://github.com/marienfressinaud/FreshRSS/issues/328#issuecomment-43250647
2014-06-14 14:19:44 +02:00
Alexis Degrugillier
09fb8edc88 Fix wording 2014-06-14 06:40:03 -04:00
Marien Fressinaud
49110afaa8 Merge pull request #517 from Draky50110/dev
Un peu de typo FR (points/exclam)
2014-06-14 09:42:11 +02:00
draky50110
c350828cbe Un peu de typo FR (points/exclam) 2014-06-14 09:28:36 +02:00
Marien Fressinaud
5a98cc7532 Merge branch 'aledeg-user-queries' into dev 2014-06-14 09:05:46 +02:00
Marien Fressinaud
a7e8332809 Improve system of queries
- Coding style
- More checks server side
- Default query name is "Query n°X"
- List of queries is moved into nav_menu, in a dropdown
- Better system to remove fields in JS (to a.remove elements, give an
  attibute data-remove="id_to_remove")
- Fix a bug in lib/Mine/Request.php (htmlspecialchars_utf8 can be applied on
  arrays now)
- Few theme improvements
- Add an element .no-mobile to apply to elements which should not appear on
  mobiles

See https://github.com/marienfressinaud/FreshRSS/pull/498
2014-06-14 09:04:31 +02:00
Alexis Degrugillier
1affa91312 Refactor idle feed stats 2014-06-13 18:19:09 -04:00
Marien Fressinaud
2b8dc66634 Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries
Conflicts:
	app/layout/nav_menu.phtml
2014-06-13 20:20:43 +02:00
Marien Fressinaud
a4dac0f791 Version 0.7.2 0.7.2 2014-06-13 18:54:26 +02:00
Marien Fressinaud
f58fdfe93d Merge branch 'dev' into beta 2014-06-13 18:51:52 +02:00
Marien Fressinaud
61f4d54578 Fix problem token
Token was visible in all URLs of nav menu
2014-06-13 18:33:52 +02:00
Marien Fressinaud
76b21e5e61 Update CHANGELOG 2014-06-13 18:27:45 +02:00
Marien Fressinaud
8c132b2acd Fix theme paths for install.php 2014-06-13 18:14:44 +02:00
Alexis Degrugillier
ef4961fe85 Refactor statistics
I made a new controller to handle statistics. The old statistics have been moved in that controller and a new action has been added to display idle feeds. I also added a menu in the left panel to navigate between the statistics pages.
See #90
2014-06-13 01:00:27 -04:00
Marien Fressinaud
b2eda4a349 Fix font-size for titles (Origine) 2014-06-12 23:04:30 +02:00
Marien Fressinaud
5707a16328 Fix alignment buttons (Origine)
Fix https://github.com/marienfressinaud/FreshRSS/issues/506
2014-06-12 22:57:43 +02:00
Marien Fressinaud
b8e4ed0d5d Fix Origine
- Fix font-size of main content titles (h1.title)
- Remove margin of blockquotes
2014-06-12 22:25:58 +02:00
Marien Fressinaud
0270224c8a Add a note avout branches in README
+ add loading gif in Origine theme
2014-06-12 22:16:02 +02:00
Marien Fressinaud
497853022a Fix some theme and UI problems
- More stick buttons!
- Fix line-height of titles + fix load more on mobile (Origine)
- Fix content width and filter buttons (Dark and Flat)
2014-06-12 21:58:39 +02:00
Marien Fressinaud
1dab7402bc Merge branch '320-template' into dev 2014-06-05 22:44:42 +02:00
Marien Fressinaud
ce063a5577 Update themes Dark and Flat (notifications and icons) 2014-06-05 22:44:02 +02:00
Marien Fressinaud
b8f53b0525 Add an option to choose content width
- 4 options: thin, medium, large and no limit
- Thin is by default
2014-06-05 22:26:18 +02:00
Marien Fressinaud
5ea82076fa Improve toggle-password
Add class "active" to button which reveals the password and remove it
when revealing is terminated
2014-06-05 21:56:58 +02:00
Marien Fressinaud
92993b26a8 Merge branch 'dev' into 320-template 2014-06-05 21:52:48 +02:00
Marien Fressinaud
9d4269ddcb Add titles for help buttons (sharing configuration) 2014-06-05 21:50:47 +02:00
Marien Fressinaud
e47f915920 Improve page of sharing configuration
- Use sticks
- Change order of buttons
2014-06-05 21:48:03 +02:00
Marien Fressinaud
7ded58e808 Add icons 2014-06-05 21:47:36 +02:00
Marien Fressinaud
e70933dfeb Update links to change view
- Dropdown menu is transformed into stick buttons
- 3 new icons (view-normal, view-global, view-reader)
- Link to access RSS is now next to these buttons (should we kept it
  here?)
2014-06-05 21:25:21 +02:00
Marien Fressinaud
192c0a001d Add some stick buttons 2014-06-05 20:39:17 +02:00
Marien Fressinaud
9b3673f945 Rename Origine2 into Origine (v0.2)
- Remove template files (will be moved into another repository later)
- Rename Origine2 into Origine
- Change version (0.1 -> 0.2)

See https://github.com/marienfressinaud/FreshRSS/issues/320
2014-06-05 20:26:00 +02:00
Marien Fressinaud
9916d6f791 Update themes
- Fix some Webkit problems
- Change render of #bigMarkAsRead
2014-06-05 20:15:45 +02:00
Marien Fressinaud
1c2cdd7650 Fix bug openNotification function (Origine2)
Add class "notification"
2014-06-05 19:12:05 +02:00
Marien Fressinaud
b791134b89 Fix theme Origine2 and template
See https://github.com/marienfressinaud/FreshRSS/issues/320
2014-06-04 19:46:48 +02:00
Marien Fressinaud
4bdabbd39f Fix theme Origine2
It should be equivalent to Origine (modulo some improvements)

See https://github.com/marienfressinaud/FreshRSS/issues/320
2014-06-03 23:41:19 +02:00
Marien Fressinaud
5f5bf67d84 Fix sizes in Origine2
Dropdowns and buttons had not homogeneous font-sizes
See https://github.com/marienfressinaud/FreshRSS/issues/320
2014-06-03 21:12:01 +02:00
Marien Fressinaud
1fdd76bc1d Add theme Origine2
- Based on the new template
- Should remplace Origine later
- It is still not finished, there are a lot to do
2014-06-03 20:19:32 +02:00
Alexandre Alapetite
d1b31b1a61 Search order of filters
For now, process them in the same order as specified by the user
Specifying for instance `date:` first will be much faster than
specifying a free text word first.
https://github.com/marienfressinaud/FreshRSS/issues/511
2014-06-01 15:23:30 +02:00
Alexandre Alapetite
f94b6d46f7 CHANGELOG searching
https://github.com/marienfressinaud/FreshRSS/issues/511
2014-06-01 15:10:34 +02:00
Alexandre Alapetite
1857d2121c lib_date comment
https://github.com/marienfressinaud/FreshRSS/issues/511
2014-06-01 14:56:50 +02:00
Alexandre Alapetite
a1adac617a lib_date comment
https://github.com/marienfressinaud/FreshRSS/issues/511
2014-06-01 14:55:03 +02:00