Commit Graph

60 Commits

Author SHA1 Message Date
Yassine Guedidi 0e836a3d87 Rename compose file the official preferred way
See https://docs.docker.com/compose/intro/compose-application-model/#the-compose-file
2024-11-19 20:55:47 +01:00
Yassine Guedidi 742742f67d
Merge pull request #7288 from yguedidi/setup-blackfire
Setup Blackfire
2024-02-26 14:05:30 +01:00
Yassine Guedidi 0ce5570cec Move assets to assets/ root folder "as is" 2024-02-24 23:54:36 +01:00
Yassine Guedidi e7a348cd0f Setup Blackfire 2024-02-24 19:28:36 +01:00
Yassine Guedidi a37b385c23 Move source files directly under src/ directory 2024-02-23 07:42:47 +01:00
Simounet 7eda9811b8
wallassets folder added to .gitignore 2023-12-21 18:03:18 +01:00
Nicolas Lœuillet b1752b619d Add display article configurator (font family, font size, line height and max width) 2023-08-22 13:02:50 +02:00
Yassine Guedidi 2aa7e7e121 Ignore docker-compose.override.yml 2023-08-08 01:35:52 +01:00
Yassine Guedidi c73c6052b6 Ignore .php-cs-fixer.cache as cache file 2022-08-15 13:23:02 +02:00
Yassine Guedidi 82ff002223 Ignore local .php-cs-fixer.php file 2022-08-15 13:23:02 +02:00
Yassine Guedidi eda4ff0336 Remove SensioDistributionBundle 2022-05-21 23:35:53 +02:00
Yassine Guedidi acb849e1a4 Exclude local phpunit.xml 2022-04-29 00:20:20 +02:00
Kevin Decherf f51008aef0 Update docker-compose and Dockerfile for dev env
This change should ease the spawn of a development environment.
It can be used as a vscode devcontainer.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2022-04-04 10:10:55 +02:00
Jeremy Benoist 7332d1f4e5
Remove support for PHP < 7.2
Updating deps

  - Removing electrolinux/php-html5lib (0.1.0)
  - Updating doctrine/inflector (1.3.1 => 1.4.3)
  - Updating doctrine/lexer (1.0.2 => 1.2.1)
  - Installing symfony/polyfill-php80 (v1.17.0)
  - Updating symfony/service-contracts (v1.1.8 => v2.1.2)
  - Installing symfony/deprecation-contracts (v2.1.2)
  - Updating symfony/mime (v4.4.8 => v5.1.1)
  - Updating friendsofsymfony/rest-bundle (2.7.4 => 2.8.0)
  - Updating doctrine/instantiator (1.3.0 => 1.3.1)
  - Updating ocramius/proxy-manager (2.1.1 => 2.2.3)
  - Updating php-http/discovery (1.7.4 => 1.8.0)
  - Updating symfony/http-client-contracts (v1.1.8 => v2.1.2)
  - Updating symfony/http-client (v4.4.8 => v5.1.1)
  - Updating php-http/httplug-bundle (1.16.0 => 1.18.0)
  - Updating symfony/phpunit-bridge (v4.3.11 => v5.1.1)
  - Updating doctrine/data-fixtures (1.3.3 => 1.4.3)
  - Updating composer/xdebug-handler (1.4.1 => 1.4.2)
  - Updating masterminds/html5 (2.7.0 => 2.7.1)
  - Updating j0k3r/php-readability (1.2.4 => 1.2.5)
  - Updating phpoption/phpoption (1.7.3 => 1.7.4)
  - Updating nikic/php-parser (v4.4.0 => v4.5.0)
  - Installing thecodingmachine/safe (v1.1.1)
  - Updating spomky-labs/otphp (v9.1.4 => v10.0.1)
  - Updating pagerfanta/pagerfanta (v2.1.3 => v2.3.0)

Package white-october/pagerfanta-bundle is abandoned, you should avoid using it. Use babdev/pagerfanta-bundle instead.

  - Removing white-october/pagerfanta-bundle (v1.3.2)
  - Installing babdev/pagerfanta-bundle (v2.4.2)

Upgrading PHPStan to 0.12 and use extension installer

  - Removing phpstan/phpdoc-parser (0.3.5)
  - Removing nette/utils (v3.1.2)
  - Removing nette/schema (v1.0.2)
  - Removing nette/robot-loader (v3.2.3)
  - Removing nette/php-generator (v3.4.0)
  - Removing nette/neon (v3.1.2)
  - Removing nette/finder (v2.5.2)
  - Removing nette/di (v3.0.4)
  - Removing nette/bootstrap (v3.0.2)
  - Updating phpstan/phpstan (0.11.19 => 0.12.29)
  - Updating phpstan/phpstan-doctrine (0.11.6 => 0.12.16)
  - Updating phpstan/phpstan-phpunit (0.11.2 => 0.12.11)
  - Updating phpstan/phpstan-symfony (0.11.6 => 0.12.6)
  - Installing phpstan/extension-installer (1.0.4)

Upgrading jms/serializer-bundle to version 3 (and willdurand/hateoas-bundle to version 2)

  - Removing phpoption/phpoption (1.7.4)
  - Removing phpcollection/phpcollection (0.5.0)
  - Removing jms/parser-lib (1.0.0)
  - Updating jms/metadata (1.7.0 => 2.3.0)
  - Updating jms/serializer (1.14.1 => 3.7.0)
  - Updating jms/serializer-bundle (2.4.4 => 3.6.0)
  - Updating willdurand/hateoas (2.12.0 => 3.6.0)
  - Updating willdurand/hateoas-bundle (1.4.0 => 2.1.0)

Upgrading dama/doctrine-test-bundle to version 6

  - Updating dama/doctrine-test-bundle (v5.0.3 => v6.2.0)
2020-06-15 08:25:59 +02:00
Luc Didry 7a4c375ebf
Allow custom styles system wide
Should fix #4060
2019-10-11 10:40:25 +02:00
Jeremy Benoist 34be2d5de4
Add ability to import/export tagging rules
- Add missing translations
- Add some tests
- Add `/api/taggingrule/export` API endpoint
- Add baggy theme
- Add error message when importing tagging rules failed
- Also fix all translations (I think we are good now)
2019-07-08 09:38:32 +02:00
Jeremy Benoist 6546aca4a3
Keep composer.lock
We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too.
Now we have less contributions (sadly) so I think we won't run against that problem.
Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install.
It'll also be much easier to make release.
Scrutinizer & Travis will be faster too.
2019-05-29 11:41:07 +02:00
Kevin Decherf efbbfe0135 Updating .gitignore
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:20:56 +02:00
Jeremy Benoist f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jeremy Benoist 906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +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
Thomas Citharel d49cdfe2ef Ignore tests exported files 2017-04-29 19:41:14 +02:00
Jeremy Benoist 535bfcbe80
Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Thomas Citharel a494c33ef7
Basically, fix everything
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
2016-10-03 23:08:26 +02:00
Thomas Citharel fc487c4eb1
Remove .idea stuff 2016-09-28 15:42:09 +02:00
Thomas Citharel c146f6940a
Assets work
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
2016-09-28 10:30:18 +02:00
Jeremy Benoist 0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
Jeremy Benoist 8d8d48a2bb Remove binary from repo
Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

⚠️ You have to update your Composer to the 1.2 (`composer selfupdate`)
2016-07-20 10:51:37 +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
Jeremy Benoist 173629a400 Ignore composer.lock
Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor.
Mostly because conflict are too frequent.

By ignoring composer.lock we ease the PR submission and rebase.

BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it.

Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.
2016-01-20 18:49:45 +01:00
Jeremy Benoist 73cd160bfc Switch to Symfony 3 structure 2016-01-15 09:35:39 +01:00
Fabien MEURILLON 1d41effebc Add Docker configuration for Postgres and MariaDB 2016-01-10 15:01:11 +01:00
Fabien MEURILLON 540ef5e084 Add basic docker-compose configuration 2016-01-10 14:41:42 +01:00
Jeremy 8378485e33 Simplify build system 2015-03-03 19:20:08 +01:00
Jeremy 32da2a70ef Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle

Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
2015-03-01 10:49:16 +01:00
Jeremy c5772d118f Installation should be launch manually
Also upadte readme for v2 and define a test database (for the future)
2015-02-02 07:48:16 +01:00
Nicolas Lœuillet e4788de51e 1st implementation of wallabag api, yeah 2015-01-28 17:09:27 +01:00
Nicolas Lœuillet 2cdb0b8f40 change gitignore, last time, I promised 2015-01-28 13:28:12 +01:00
Nicolas Lœuillet b2d9357c78 change gitignore 2015-01-28 13:27:00 +01:00
Nicolas Lœuillet dc61832a9e change gitignore 2015-01-28 13:23:07 +01:00
Nicolas Lœuillet 33767049a5 change gitignore 2015-01-28 13:10:59 +01:00
Nicolas Lœuillet 93fd4692f6 symfony is there 2015-01-22 08:30:07 +01:00
Nicolas Lœuillet 19875ef0da add install script after composer install 2015-01-21 14:45:39 +01:00
Nicolas Lœuillet 79e051a1f2 restructure folders 2015-01-20 14:11:26 +01:00
Nicolas Lœuillet 6ad93dff69 new folders 2015-01-20 07:40:39 +01:00
Nicolas Lœuillet d3122db7b2 add DS_Store in gitignore 2014-11-08 08:25:00 +01:00
Nicolas Lœuillet c4800fc6da ignore vagrant directory 2014-10-30 20:42:17 +01:00
Nicolas Lœuillet d3b52886f5 [change] ignore tmp files in HTML purifier 2014-03-02 08:52:03 +01:00
Nicolas Lœuillet 34bf601a56 change submodule & gitignore 2013-10-03 13:59:52 +02:00
Nicolas Lœuillet 00dbaf90bc merge #224 2013-09-20 10:21:39 +02:00