Commit graph

3720 commits

Author SHA1 Message Date
Aline
34806fab1b Fix reviews
Signed-off-by: Aline <chetta.aline@gmail.com>
2017-05-07 15:07:50 +02:00
Thomas Citharel
14f58edd80 fixed margin on sidebar menu 2017-05-05 09:19:56 +02:00
Thomas Citharel
2003ffa97e Fix according to review 2017-05-04 17:44:42 +02:00
Thomas Citharel
18e1da6277 rebase
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:56:52 +02:00
Thomas Citharel
4cea76b0cf Use npm script instead of direct webpack call
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
Thomas Citharel
42a2139b8f fix travis 2017-05-04 14:49:44 +02:00
Thomas Citharel
17cc3aacb7 fix theme changes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
Thomas Citharel
e35f8439a7 add comment to config.yml to explain live reload feature 2017-05-04 14:49:44 +02:00
Thomas Citharel
8655913ebf disable default dev server 2017-05-04 14:49:44 +02:00
Thomas Citharel
64f81bc316 Adds Webpack support and removes the use for Grunt
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use scss

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix build, add babel, fix annotations

fixes (and improvements !) for baggy

add live reload & environments & eslint & theme fixes
2017-05-04 14:49:44 +02:00
Jérémy Benoist
3b4502e0e6 Merge pull request #3079 from wallabag/update-doc
Fixed old links in documentation
2017-05-04 07:07:20 +02:00
Nicolas Lœuillet
79d8f0d459
Updated documentation version 2017-05-03 15:58:36 +02:00
Nicolas Lœuillet
56f9a60f49
Fixed old links in documentation 2017-05-03 15:54:56 +02:00
Nicolas Lœuillet
9c09c253fe Merge pull request #3047 from wallabag/add-notmatches-operator
Added notmatches operator for tagging rule
2017-05-03 11:53:01 +02:00
Nicolas Lœuillet
a162b1a99b
Changed export test 2017-05-03 10:53:10 +02:00
Nicolas Lœuillet
dfa0822f19 Merge pull request #3075 from wallabag/disable-shortcuts-login
Disabled shortcuts on login/register page
2017-05-02 16:59:49 +02:00
Nicolas Lœuillet
0e6509c3d8 Merge pull request #3073 from wallabag/fix-sandwich
Fixed sandwich menu position in entry view (material theme)
2017-05-02 16:42:26 +02:00
Nicolas Lœuillet
a40029f9d6
Disabled shortcuts on login/register page 2017-05-02 16:21:06 +02:00
Nicolas Lœuillet
96e4398072
Fixed sandwich menu position in entry view (material theme) 2017-05-02 15:40:15 +02:00
Jeremy Benoist
e1d64050ad
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-01 22:15:46 +02:00
Nicolas Lœuillet
3cbb0cc3ef Merge pull request #3055 from wallabag/api-bulk-add-tags
Added API endpoint to handle a list of URL and to add/delete tags
2017-05-01 09:04:41 +02:00
Jérémy Benoist
9579003045 Merge pull request #3066 from wallabag/ignore-tests-exported-files
Ignore tests exported files
2017-04-29 22:51:32 +02:00
Thomas Citharel
d49cdfe2ef Ignore tests exported files 2017-04-29 19:41:14 +02:00
Jérémy Benoist
8ee18fdabc Merge pull request #3064 from gileri/master
Correct create_application en string
2017-04-29 15:43:42 +02:00
Jeremy Benoist
dcbebc17aa
Fix tests 2017-04-29 12:58:39 +02:00
Éric Gillet
ef88b37eb5 Correct create_application en string 2017-04-29 12:30:12 +02:00
Jérémy Benoist
c5e04b0109 Merge pull request #3057 from raf64flo/patch-1
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-26 09:10:28 +02:00
Raphaël Flores
e6ec001c6a Fix IT translation #3057 2017-04-25 16:52:02 +02:00
Raphaël Flores
283aca210a Fix typos. Fix #3057 2017-04-25 15:52:51 +02:00
Raphaël Flores
6f01c10c88 Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. 2017-04-25 15:35:51 +02:00
Raphaël Flores
b40c479a40 Remove 'fr' from Firefox extension URL 2017-04-25 15:17:08 +02:00
Raphaël Flores
83bf04f09e Update Firefox extension and Android links
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-25 15:11:53 +02:00
Jérémy Benoist
138c352cd7 Merge pull request #3052 from shtrom/fix-relative-symlinks
Make symfony-assets-install use `relative` symlinks
2017-04-25 14:15:01 +02:00
Nicolas Lœuillet
80299ed282
Added endpoint to handle URL list to add/delete tags 2017-04-24 12:24:17 +02:00
Nicolas Lœuillet
d1fc590211
Added API endpoint to handle a list of URL and to add/delete tags 2017-04-24 11:12:41 +02:00
Olivier Mehani
f972af3f5b Make symfony-assets-install use relative symlinks
This facilitates packaging, when installing in a different work PREFIX
than the final install location.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2017-04-22 21:45:30 +10:00
Nicolas Lœuillet
b8acf672c0 Merge pull request #3048 from wallabag/remove-download-pictures
Cleaned craue_config_setting by removing useless download_pictures setting
2017-04-22 13:20:44 +02:00
Nicolas Lœuillet
a375fed7bf
Fixed @j0k3r review 2017-04-22 13:14:34 +02:00
Nicolas Lœuillet
21d955f703
Cleaned craue_config_setting by removing useless download_pictures setting 2017-04-20 15:45:43 +02:00
Nicolas Lœuillet
fdd725f58c Added notmatches operator for tagging rule 2017-04-20 15:17:02 +02:00
Nicolas Lœuillet
64f1d8f77a Merge pull request #3024 from wallabag/store-date
Added publication date and author
2017-04-18 13:12:28 +02:00
Jérémy Benoist
c5ba478dc3 Merge pull request #3044 from wallabag/fos-user-2.0
Remove dev FOSUserBundle
2017-04-18 09:49:59 +02:00
Jeremy Benoist
177ef14c15
Remove dev FOSUserBundle 2017-04-18 08:08:26 +02:00
Jérémy Benoist
531828ca44 Merge pull request #3030 from wallabag/remove-isPublic-from-entry
Remove isPublic from Entry entity fix #2598
2017-04-14 14:56:26 +02:00
Nicolas Lœuillet
01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +02:00
Maxime
15e4aea678 Remove isPublic from Entry entity fix #2598 2017-04-13 13:12:19 +02:00
Nicolas Lœuillet
3e7a843aa9 Merge branch 'master' into 2.3 2017-04-13 13:07:06 +02:00
Nicolas Lœuillet
e9c80c99bd
Added test for multiple authors 2017-04-10 17:58:27 +02:00
Nicolas Lœuillet
3aa655e44a
Fixed migrations 2017-04-10 09:26:08 +02:00
Nicolas Lœuillet
7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00