mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity
4404 commits 12 branches 100 tags 170 MiB
Commit graph

296 commits

Author SHA1 Message Date
Paulino Michelazzo
5d6cffedb1 Update Portuguese (Brazilian) translation 
Adding the config.yml on the package.
 2016-10-19 19:25:48 +02:00
Nicolas Lœuillet
f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet
ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Jeremy Benoist
f1c3f68e90
ApiDoc & Route annotation were conflicted 
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
 2016-10-15 16:46:42 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub 
API: ability to export entry in all available format (epub, pdf, etc...)
 2016-10-12 14:06:33 +02:00
Jeremy Benoist
fb8835cc8f Define a dev version for the master 
This is to be sure that user testing wallabag from the master will have the version defined as dev.
 2016-10-10 11:31:57 +02:00
Nicolas Lœuillet
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion 
Changed relation between API client and refresh token
 2016-10-08 13:31:54 +02:00
Jeremy Benoist
3f3a60879e
Add entry export in API 
Export isn't available for json & xml because user can use the default
entry endpoint instead.
 2016-10-08 12:59:19 +02:00
Jeremy Benoist
dd32c89ed6
Use default locale for user config 
When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
 2016-10-08 09:33:55 +02:00
Jeremy Benoist
ee32248f43
Ensure access_token are removed 
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
 2016-10-08 00:05:41 +02:00
Jeremy Benoist
6d204f5382
Add ability to use socket 
For Redis & MySQL
 2016-10-07 21:00:13 +02:00
Nicolas Lœuillet
5958597ba6
Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
Jeremy Benoist
f440e28281
Update doc 
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
 2016-10-04 10:31:03 +02:00
Jeremy Benoist
152fcccd44
Add users management UI 
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
 2016-10-02 11:08:53 +02:00
Jeremy Benoist
bfb3ae01da Merge pull request #2323 from wallabag/footer-stats 
Add simple stats in footer
 2016-10-02 11:04:49 +02:00
Jeremy Benoist
1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Jeremy Benoist
40e219622a
Customize errors templates 
All error goes to the same template which only display the error message and the status code.
 2016-10-01 14:58:48 +02:00
Jeremy Benoist
c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
Jeremy Benoist
ff1a5362f7 Add Instapaper import 
Also update ImportController with latest import (chrome, firefox & instapaper).
 2016-09-27 20:27:08 +02:00
Thomas Citharel
2c61db30b7
cs & fixes 2016-09-25 12:29:19 +02:00
Nicolas Lœuillet
e406a94ab6 Fixed version in documentation 2016-09-19 15:23:04 +02:00
Nicolas Lœuillet
8fed8d1bac Add documentation about article sharing 2016-09-19 15:20:46 +02:00
Jeremy Benoist
d7b4b2c72c
Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
Jeremy Benoist
ac87e0db2a
AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
Jeremy Benoist
b3437d58ae
Enable Redis async import 
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
 2016-09-11 21:58:56 +02:00
Jeremy Benoist
13470c3596
Add test for RabbitMQ 
Also update Symfony deps
 2016-09-11 21:58:56 +02:00
Jeremy Benoist
c98db1b653
Convert other imports to Rabbit 2016-09-11 21:58:31 +02:00
Jeremy Benoist
ef75e1220e
Send every imported item to the queue 
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
 2016-09-11 21:57:46 +02:00
Nicolas Lœuillet
56c778b415
1st draft for rabbitMQ 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet
5bdec0195f
Prepare wallabag 2.0.8 2016-09-07 14:27:32 +02:00
Nicolas Lœuillet
429d86f388
Added tags counter in sidebar (material theme) 2016-09-04 20:53:28 +02:00
Jeremy Benoist
8f8654913c Merge pull request #2002 from wallabag/feature-display-itemsNumber 
Feature display items number
 2016-09-03 16:13:08 +02:00
Nicolas Lœuillet
b3f4a11a81
Store cache lifetime in config 2016-09-03 14:02:50 +02:00
Jeremy Benoist
60e7220406 Merge pull request #1904 from wallabag/feature-public-mode 
Share entry with a public URL
 2016-08-25 09:30:51 +02:00
Nicolas Lœuillet
f3d0cb9106 Share entry with a public URL 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
8315130a75
Display entries number for each category 2016-08-23 07:47:55 +02:00
Thomas Citharel
7149aa5781
Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
Thomas Citharel
de3d716ae4
Add option to disable registration 2016-08-23 07:40:36 +02:00
Jeremy Benoist
79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Nicolas Lœuillet
5068544e10
Prepare wallabag 2.0.7 2016-08-22 10:08:21 +02:00
Jeremy Benoist
e408d7e895 Merge pull request #2220 from Rurik19/master 
Enable PATCH method for CORS in API part
 2016-08-18 11:56:02 +02:00
Rurik19
41c9eecfa7 Enable PATCH method for CORS in API part 2016-08-18 14:30:32 +05:00
Nicolas Lœuillet
2e16a90339 Merge pull request #2216 from Rurik19/master 
Enable CORS headers for OAUTH part
 2016-08-16 14:22:43 +02:00
Rurik19
848c2e1b97 Enable CORS headers for OAUTH part 2016-08-12 13:01:53 +05:00
Nicolas Lœuillet
a26f91dcb6 Prepare release 2.0.6 2016-08-10 14:26:13 +02:00
Jeremy Benoist
0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
Jeremy Benoist
fdc90ceb17 Change the way to login user in tests 
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport
 2016-06-24 11:55:47 +02:00
Jeremy Benoist
2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +02:00
Jeremy Benoist
f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Thomas Citharel
5ecdfcd041 manage assets through npm 
first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
 2016-06-09 17:12:51 +02:00
Nicolas Lœuillet
17dfff6918 Prepare wallabag 2.0.5 2016-05-31 21:18:22 +02:00
Nicolas Lœuillet
961ec4ec86
Prepare wallabag 2.0.4 2016-05-07 13:26:55 +02:00
Daniele Conca
8b09c6edfb Update config.yml 
add italian as available language
 2016-05-03 18:24:14 +02:00
Nicolas Lœuillet
dafde7fb2f
Prepare release 2.0.3 2016-04-22 18:08:16 +02:00
Nicolas Lœuillet
7d5b4631d0 Merge pull request #1948 from wallabag/prepare-202 
Prepare release 2.0.2
 2016-04-21 09:44:44 +02:00
Nicolas Lœuillet
4a25bef077
Update links in documentation 2016-04-19 20:03:34 +02:00
Nicolas Lœuillet
18bb5a90d5
Prepare release 2.0.2 2016-04-19 10:01:29 +02:00
Nicolas Lœuillet
f2e5fdc366 Merge pull request #1916 from wallabag/cleanup 
Convert array + phpDoc
 2016-04-13 09:43:14 +02:00
Jeremy Benoist
86732aa01c Move test parameters out of parameters.yml 
The end user doesn't care to about the test database.
 2016-04-12 22:14:22 +02:00
Nicolas Lœuillet
c95e39c51a
Lost in translation pager 2016-04-12 20:38:56 +02:00
Nicolas Lœuillet
d098cb04a8 Prepare release 2.0.1 2016-04-11 11:13:02 +02:00
Jeremy Benoist
69c21157ba Force server version to avoid connexion error 
When installing a new project with MySQL, if the database doesn't exist before installation will fail because DBAL will try to get the server version by querying it.
And since this query is done using the default database connexion and since the database doesn't exist, DBAL can't connect to the server.
 2016-04-10 15:34:32 +02:00
Nicolas Lœuillet
eff75729a1 🚀 Prepare v2.0.0 🎂 2016-04-03 18:56:53 +02:00
Jeremy Benoist
187868d137 Add Occitan to available language 2016-04-01 10:36:07 +02:00
Jeremy Benoist
d2b4f01d74 Disable translation in test 
We don't want to test translation in test
 2016-03-20 21:10:58 +01:00
Nicolas Lœuillet
bca5485946 Added setting to have a personal reading time 2016-03-14 13:01:31 +01:00
Nicolas Lœuillet
83be3dc097 Prepare files for 2.0.0-beta.2 2016-03-10 12:43:03 +01:00
Vincent
2b4770301c Add version in API 2016-03-07 15:00:03 +01:00
Juanjo Benages
e5f3b04cce Spanish translation 2016-03-01 23:26:03 +01:00
Nicolas Lœuillet
6e3d65ccb0 Prepare wallabag for first beta 🚀 2016-02-29 21:34:36 +01:00
Morten Juhl-Johansen Zölde-Fejér
449df236ac Fixed indentation issue 2016-02-27 16:33:16 +01:00
Morten Juhl-Johansen Zölde-Fejér
8ccc306468 config.yml edit to include Danish 2016-02-27 16:16:32 +01:00
Nicolas Lœuillet
4dc872238a Rename CommentBundle with AnnotationBundle 2016-02-26 18:14:42 +01:00
Thomas Citharel
f38e03dc02 Comment work with annotator v2 
- add missing annotator.js file and fix typo
- edit & delete routes, started tests
- basic tests
 2016-02-26 18:13:17 +01:00
Nicolas Lœuillet
fbbda94110 Fix #1351: add maintenance mode 2016-02-22 12:33:09 +01:00
Jeremy Benoist
077ddbe1ae Use a different way to use piwik 2016-02-22 11:11:08 +01:00
Nicolas Lœuillet
07643dde08 Fix #1137: implemented Piwik 2016-02-19 15:27:57 +01:00
mruminski
ee40ccf260 Update config.yml 
add Polish
 2016-02-17 21:29:29 +01:00
Jeremy Benoist
861bbfcbd4 Merge pull request #1680 from wallabag/v2-capistrano-sf3 
Update Capistrano configuration for symfony3
 2016-02-17 15:22:19 +01:00
Nicolas Lœuillet
28a5ee6fcf Update Capistrano configuration for symfony3 2016-02-17 15:02:50 +01:00
steve
d8f5b27012 Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". 2016-02-17 01:56:51 +02:00
Masoud Abkenar
e2b4f0e2e7 Added Persian (fa) (فارسی) 2016-02-16 16:58:10 +01:00
Nicolas Lœuillet
bc358c9180 CS 2016-02-04 16:06:05 +01:00
Nicolas Lœuillet
3eb06f2891 Fix #1622: parameter for FosUser confirmation 2016-02-04 16:00:45 +01:00
Nicolas Lœuillet
e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page 
Settings page
 2016-02-04 15:59:57 +01:00
Jeremy Benoist
e43d27f845 Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight 
[#1604] First draft to fix SensioLabsInsight report
 2016-02-01 13:51:35 +01:00
Nicolas Lœuillet
61c640ed31 Fix #1635: change database name for test environments (mysql/pgsql) 2016-02-01 13:22:34 +01:00
Jeremy Benoist
48e3007b7f Fix from_email & fos_user 2016-01-31 15:31:34 +01:00
Jeremy Benoist
a74a6ca2b1 Add new export config 2016-01-31 15:31:30 +01:00
Jeremy Benoist
07c9b1c98a Fix permission to settings page 2016-01-31 14:48:26 +01:00
Jeremy Benoist
63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
Jeremy Benoist
26975877d7 Always include warning message 
We'll remove it later, on the stable release
 2016-01-31 14:37:19 +01:00
Jeremy Benoist
bc78968764 Move default configuration out of parameters 
These default configuration value shouldn't be in parameters.yml.
 2016-01-31 14:37:19 +01:00
Nicolas Lœuillet
143869525f Merge pull request #1629 from wallabag/fixexportformats 
fix #1620 and introduce new parameters to export
 2016-01-24 18:48:28 +01:00
Thomas Citharel
b89444ad8b fix #1620 and introduce new parameters to export 2016-01-24 18:21:09 +01:00
Ogün Karakuş
f47101e0c4
Add Turkish translation 
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
 2016-01-24 17:27:26 +02:00
Nicolas Lœuillet
a40dd9896b [#1621] Add default address for FosUser 2016-01-23 14:30:56 +01:00
Nicolas Lœuillet
5f8a785719 SensioLabsInsight fixes 2016-01-22 21:12:11 +01:00
Nicolas Lœuillet
b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
Jeremy Benoist
abd454c456 Update HTML 2FA template 
Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)
 2016-01-21 11:03:27 +01:00
Jeremy Benoist
3bcc4d4cb2 Merge pull request #1584 from wallabag/v2-cleanup 
some cleanup
 2016-01-15 16:29:06 +01:00
Nicolas Lœuillet
160e2d8f0b some cleanup: 
* move capistrano config files
* remove useless files
 2016-01-15 16:07:57 +01:00
Nicolas Lœuillet
b91465c067 remove flattr on about page 2016-01-15 15:46:46 +01:00
Jeremy Benoist
d8dbe76bf5 Add assets config 
To avoid :
> Twig_Error_Syntax: Unknown "asset" function in
 2016-01-15 09:35:39 +01:00
Jeremy Benoist
73cd160bfc Switch to Symfony 3 structure 2016-01-15 09:35:39 +01:00
Jeremy Benoist
1d405d0e62 Remove some commented code 2016-01-15 09:35:39 +01:00
Jeremy Benoist
5c895a7fd1 Update bundle & stock file 
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
 2016-01-15 09:35:38 +01:00
Fabien MEURILLON
1d41effebc Add Docker configuration for Postgres and MariaDB 2016-01-10 15:01:11 +01:00
Nicolas Lœuillet
292c1324e9 Installation & configuration of Doctrine Migrations 2016-01-08 16:27:29 +01:00
Jeremy Benoist
6d7c7a6e3f Remove real consumer key 
We should never commit them :)
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
7019c7cf6c Add tagged services for import 
- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
Jeremy Benoist
77a7752a59 Update after previous merge 
PR #1443 was merged into this branch to handle all import type in the same place.
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet
303768dfe9 - remove importers configuration 
- add check on userId for findOneByURL for entries
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet
dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
9c9c23cf08 forgot test parameters 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
1f4408de9e 1st draft for Pocket import via API 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
d275bdf4d3 form to upload file 2016-01-02 23:24:17 +01:00
Jeremy Benoist
23ff8d3619 Add custom email for 2FA 
Related #1490
 2015-12-29 11:17:06 +01:00
Nicolas Lœuillet
3c65dfb735 add slug for tags 2015-12-28 12:49:45 +01:00
Kévin Gomez
625acf3352 Add a command to automatically tag all entries for a user 2015-11-11 16:27:19 +01:00
Jeremy Benoist
add597bad9 Rework on export 
- all export now return a `HttpFoundation\Response`
- return a 404 on unsupported format
- add tests
 2015-11-09 16:32:48 +01:00
Jeremy Benoist
bd0f3d32c9 Quoted entity to avoid reserved keyword 
Should fix #1498
 2015-11-07 14:15:33 +01:00
Jeremy Benoist
5ead137fe6 Fix pattern deprecation 
Replaced by path
 2015-11-07 00:16:26 +01:00
Julian Oster
57cf6fd76c Add language to config.yml 2015-10-18 22:04:50 +02:00
Nicolas Lœuillet
c89d35e851 Language selection on config screen 2015-10-15 21:42:29 +02:00
Nicolas Lœuillet
e9b395ec4b forgot parameters for travis 2015-10-15 13:20:44 +02:00
Nicolas Lœuillet
18cf594f8a move 2factor activation in parameters 2015-10-15 13:17:21 +02:00
Nicolas Lœuillet
0d6a7929e1 add tests for 2factor authentication 2015-10-14 17:10:12 +02:00
Nicolas Lœuillet
2db616b586 2factor authentication via email 2015-10-13 22:43:15 +02:00
Nicolas Lœuillet
ec3ce598f6 material design for register/login/recover pages 2015-10-05 22:16:18 +02:00
Jeremy Benoist
4c5e544183 Cleanup 
- remove unecessary routing for UserBundle
- remove unused form type
 2015-10-03 13:37:21 +02:00
Nicolas Lœuillet
0a878469d4 move some files to UserBundle 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet
1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet
cd1298d6df allow API documentation for anonymous 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet
fcb1fba5c2 * public registration 
* remove WSSE implementation
* add oAuth2 implementation
 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet
2afdea1ccc forgot one file 2015-09-29 23:11:27 +02:00
Jeremy Benoist
03fb6fde5f Add multiple database tests on Travis 2015-09-26 11:56:15 +02:00
Nicolas Lœuillet
a1691859ca implement FosUser 2015-09-11 20:32:37 +02:00
Nicolas Lœuillet
50243f0e34 fix #1357, truncate domain name if it's too loooong 2015-08-24 22:09:57 +02:00
Jeremy Benoist
7d6c3edcdd Fix date filter on same day 
Fix #1379
 2015-08-22 15:36:07 +02:00
Jeremy Benoist
6682139ec5 CS 2015-08-20 20:39:52 +02:00
Nicolas Lœuillet
fdab81e910 warning bar: add parameter to dis/enable it 2015-08-19 16:00:15 +02:00
Jeremy Benoist
a8596c35c8 Merge pull request #1323 from wallabag/v2-1302-checkbox 
fix #1302: add 'stay connected' checkbox
 2015-08-12 13:23:52 +02:00
Jeremy Benoist
a15692b1b7 Merge pull request #1312 from wallabag/v2-fix-1311 
fix #1311, redirect after login
 2015-08-12 13:21:16 +02:00
Nicolas Lœuillet
5a58461491 add 'stay connected' checkbox 2015-08-12 12:27:12 +02:00
Nicolas Lœuillet
2686457448 store estimated reading time / filters on reading time 2015-08-12 09:01:29 +02:00
Nicolas Lœuillet
728a432850 fix #1311, redirect after login 2015-08-10 22:37:56 +02:00
Nicolas Lœuillet
4ab58dcf6c set material to default theme \o/ 2015-08-04 22:51:21 +02:00