1
1
Fork 0
Commit graph

16832 commits

Author SHA1 Message Date
Hypolite Petovan 6b23548a2b
Merge pull request #3896 from tobiasd/20171110-community
adding a global community disclaimer
2017-11-10 16:17:38 -05:00
Tobias Diekershoff fd2b807292 halfe the double 2017-11-10 22:00:39 +01:00
Hypolite Petovan cb34f06692
Merge pull request #3895 from zeroadam/Xml-#3878
Xml to src
2017-11-10 15:08:40 -05:00
Tobias Diekershoff 4f95b413fa some corrections 2017-11-10 20:57:02 +01:00
Tobias Diekershoff 3e1d0bf7a8 move HTML to template and add an optional hint that a global community page shows all arriving public postings 2017-11-10 20:25:17 +01:00
Tobias Diekershoff 3948539495 add docs for the show_global_community_hint option 2017-11-10 20:24:05 +01:00
Tobias Diekershoff df547a8bc9 move HTML from mod/community into template file 2017-11-10 18:22:28 +01:00
Adam Magness bc49fc974c Capitalized XML
Acronym classes should be capitalized
2017-11-10 07:45:33 -05:00
Adam Magness b8d9509563 Merge remote-tracking branch 'origin/Xml-#3878' into Xml-#3878 2017-11-10 07:18:32 -05:00
Adam Magness 0226aa1f15 Spelling
spelling correction for simplexmlelement
2017-11-10 07:18:24 -05:00
Adam Magness d49da294b3 Add uses
added DomXPath and SimpleXMLElement
2017-11-10 07:18:24 -05:00
Adam Magness f245bc8359 Move xml to namespace
Relocate xml from include to src
Related to #3878
2017-11-10 07:18:24 -05:00
Michael Vogel 037d6ac17b
Merge pull request #3892 from tobiasd/20171110-lng
DE and ES translations back at 100%
2017-11-10 09:25:49 +01:00
Michael Vogel 1b088482cd
Merge pull request #3893 from tobiasd/20171110-regmail
add info text about email on registration
2017-11-10 09:25:30 +01:00
Tobias Diekershoff b8a76794e0 add info text about email on registration 2017-11-10 08:06:56 +01:00
Tobias Diekershoff ff3b4c0edb update for DE 2017-11-10 07:52:47 +01:00
Tobias Diekershoff b73c99dc22 update for ES thx Albert 2017-11-10 07:52:34 +01:00
Adam Magness a2cd9d12af Spelling
spelling correction for simplexmlelement
2017-11-10 00:34:31 -05:00
Adam Magness 1f48f62e6c Add uses
added DomXPath and SimpleXMLElement
2017-11-10 00:26:41 -05:00
Adam Magness 2727104a5b Move xml to namespace
Relocate xml from include to src
Related to #3878
2017-11-10 00:00:50 -05:00
Hypolite Petovan 84e3cc6f9a
Merge pull request #3891 from rabuzarus/20171109_-_small_style_docu_corrections
pure comments shouldn't use doxygen style
2017-11-09 13:52:13 -05:00
rabuzarus 10f385efc4 pure comments shouldn't use doxygen style 2017-11-09 19:37:05 +01:00
Hypolite Petovan 1474751f23
Merge pull request #3890 from zeroadam/Cache-#3878
Move Cache to src
2017-11-09 12:28:52 -05:00
Adam Magness bc65cc2af1 Revert to require_once
Keeping these statements as they were.
2017-11-09 12:26:32 -05:00
Adam Magness 1565061454 Remove old cache file
Now that all references are updated, remove old cache.php
2017-11-09 11:49:27 -05:00
Adam Magness 06c3af9b60 Move Cache to src
relocate the cache class to Friendica\Core namespace
2017-11-09 11:05:18 -05:00
Michael Vogel 8b673bf78d
Merge pull request #3889 from MrPetovan/issue/#3878-hotfix
Issue #3878 hotfix 2
2017-11-09 10:00:07 +01:00
Hypolite Petovan a49901eaa2 Fix missing Crypto class error 2017-11-09 03:47:12 -05:00
Hypolite Petovan ee5b9de6ad Reverting RINO crypto code to php-encryption version 1.2 2017-11-09 03:20:18 -05:00
Hypolite Petovan ccf4dcf270 Reverting php-encryption to version 1.2 2017-11-09 03:19:26 -05:00
Michael Vogel 67e32ce859
Merge pull request #3888 from MrPetovan/issue/#3878-hotfix
Issue #3878 hotfix
2017-11-09 09:11:56 +01:00
Hypolite Petovan 1262d6bfee Function name typo 2017-11-09 03:01:53 -05:00
Hypolite Petovan 918f2e8593 Fix another php-encryption version migration error 2017-11-09 03:01:02 -05:00
Hypolite Petovan d5aff9ac31 Fix php-encryption version 2 compatibility issues 2017-11-09 02:35:11 -05:00
Hypolite Petovan b4ce07bdc5 Remove old library defuse/php-encryption 2017-11-09 02:21:54 -05:00
Hypolite Petovan acd65aade1 Switch to new php-encryption library version
- Remove references to library/ files
- Add namespace to library classes
2017-11-09 02:21:37 -05:00
Hypolite Petovan 3b2cd85483 Add defuse/php-encryption 2.0 to Composer dependencies 2017-11-09 02:13:02 -05:00
Hypolite Petovan ede20ac95a Updated Composer to version 1.5.2 2017-11-09 02:11:33 -05:00
Hypolite Petovan 2ad162f991
Merge pull request #3883 from zeroadam/Issue-#3878
Relocate class files from /include to /src/
2017-11-09 01:29:58 -05:00
Adam Magness cfd8ae389c Review updates
changes based on review comments.
2017-11-08 20:08:42 -05:00
Adam Magness d7dc51ecc1 Coding Standards
Guess who got phpcs configured.
Updated phpcs.xml based on Developer_Intro document.
2017-11-08 17:02:50 -05:00
Adam Magness ca5d5acb7e Another use
use Cache
2017-11-08 08:51:01 -05:00
Adam Magness 30d2e765fd Merge remote-tracking branch 'origin/Issue-#3878' into Issue-#3878 2017-11-08 08:38:04 -05:00
Adam Magness aa13302bbc Review updates
Documentation and yet another use statement
2017-11-08 08:37:03 -05:00
Adam Magness a307991ee5 Use more
More use statements based on error logs.
2017-11-08 08:37:03 -05:00
Adam Magness d857473026 Use Statements
More use statements based on error logs
2017-11-08 08:37:03 -05:00
Adam Magness 3581889fbd DFRN Update
missing use statement
2017-11-08 08:37:03 -05:00
Adam Magness 4ca68c7af0 Class file relocations
Issue #3878
2017-11-08 08:37:03 -05:00
Adam Magness 6189f6c8e7 Relocate class files from /include to /src/
dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.
2017-11-08 08:36:48 -05:00
Hypolite Petovan 2a814623d8
Merge pull request #3882 from annando/config-null
Still some more places with config stuff
2017-11-08 08:21:23 -05:00