Commit Graph

22338 Commits (acedeb9604af643c7c562b25773dd3fefbc6bcfb)
 

Author SHA1 Message Date
Oliver Günther b6ee21efb5 Merge branch 'release/4.1' into release/4.2 9 years ago
Oliver Günther af59a5403d Merge branch 'origin/release/4.0' into release/4.1 9 years ago
Oliver Günther db534a1263 Merge pull request #3264 from ulferts/fix/bump_rack_session 9 years ago
Jan Sandbrink 3a87b269fa allow to fetch aggregated journals for a journable 9 years ago
Oliver Günther fb654d0afa Correct for review 9 years ago
Jan Sandbrink db98953d4f Merge pull request #3265 from oliverguenther/feature/improve-web-service-wording 9 years ago
Oliver Günther 9d88ed6027 Remove remark regarding subversion. 9 years ago
Oliver Günther 1618c80924 Use severe notification for project destroy dialog 9 years ago
Florian Kraft 4a155d267e Merge pull request #3266 from oliverguenther/feature/severe_warnings_style 9 years ago
Oliver Günther a7f7f925f8 [ci skip] Allow notification-box.warning to be severe without being an error. 9 years ago
Oliver Günther 933c553ba9 Improve settings for mail, sys web services to improve comprehension. 9 years ago
Jens Ulferts 87646af3fa bump rack to 1.4.7 9 years ago
Jan Sandbrink a8ab1024b5 clarify explanations 9 years ago
Jan Sandbrink 5f06a8900d better PSQL compatibility for aggregated journals 9 years ago
Jan Sandbrink f02b32faad override :initial? for AggregatedJournal 9 years ago
Jan Sandbrink a5152e9875 use the actual setting for the aggregation time 9 years ago
Jan Sandbrink 88169a46de expose id of "master" as notes_id 9 years ago
Jan Sandbrink 3c3b03bbcc make SQL compliant for both MySQL and PSQL 9 years ago
Jan Sandbrink 405aa2d524 add PostgreSQL-compatible group numbering 9 years ago
Jan Sandbrink e346909b36 add more specs for aggregated journals 9 years ago
Jan Sandbrink 3b7b0ec289 Enhance AggregatedJournals to correctly merge journals with notes 9 years ago
Jan Sandbrink 8bab9a3d22 add specs for not aggregating comments 9 years ago
Jan Sandbrink ddbc8a4ba7 remove obsoleted helper 9 years ago
Jan Sandbrink 5ed1ff28c1 styling 9 years ago
Jan Sandbrink 953ad6d15f change aggregated_journals on AaJ to be a method 9 years ago
Jan Sandbrink 9e9ca84d9c test non-aggregation after time gap 9 years ago
Jan Sandbrink 885d8d734f add basic spec for aggregated journals 9 years ago
Jan Sandbrink ec720a0533 make aggregation capable for MySQL and PSQL 9 years ago
Jan Sandbrink d6533b100c first spike for aggregatable journals 9 years ago
Jan Sandbrink a59b361222 remove dead code 9 years ago
Jonas Heinrich d5299c3ec4 Fixes two incorrect english strings 9 years ago
Jan Sandbrink 0399335a92 Merge pull request #3260 from ulferts/feature/change_default_for_rest_api_enabled 9 years ago
Jan Sandbrink 5c5b1c3c46 automatically re-index journals 9 years ago
Jens Ulferts 63539001f0 Merge branch 'release/4.2' into release/4.3 9 years ago
Jens Ulferts a21335db36 safeguard spec 9 years ago
Jens Ulferts c5de9a4fb7 move spec shared context up in the dir hierarchy 9 years ago
Jens Ulferts 751751f6b4 reuse safeguards for wp index loaded in specs 9 years ago
Jens Ulferts afd5d7275d Merge branch 'release/4.2' into release/4.3 9 years ago
Jens Ulferts d5f44a0c60 hoping to fix spec with the help of ng_wait 9 years ago
Jonas Heinrich d89f9e772a Merge branch 'release/4.2' into release/4.3 9 years ago
jonasheinrich 85d37e9e1c Merge pull request #3259 from kgalli/fix/update_installation_guide 9 years ago
kgalli 753e3605d8 Replacement of analogous with similarly 9 years ago
kgalli a731ade28d Fix for a lot of typos 9 years ago
kgalli 0f98e004c2 Update guide to current installation dependencies 9 years ago
Jens Ulferts 72c98b2c6d change default on rest_api_enabled 9 years ago
ulferts fe00b85372 Merge pull request #3256 from oliverguenther/fix/module_menu_permissions 9 years ago
Oliver Günther 165e56c7ed Hide the module menu when user is anonymous and login is required. 9 years ago
ulferts 4b47a13f2d Merge pull request #3247 from NobodysNightmare/feature/fix_inconsistent_journals 9 years ago
Jens Ulferts 178e22ab58 Merge branch 'release/4.2' into release/4.3 9 years ago
ulferts a5432dadf4 Merge pull request #3255 from jonasheinrich/feature/how_to_spec_all 9 years ago