Commit graph

2644 commits

Author SHA1 Message Date
Tobias Diekershoff
dcd1a5ad79
Merge pull request #474 from annando/reformat
Just some reformatting
2017-12-11 10:03:12 +01:00
Michael
9b0816713f Just some reformatting 2017-12-11 08:12:47 +00:00
Tobias Diekershoff
85b138f187
Merge pull request #473 from annando/css-fix
Some small CSS fix
2017-12-11 08:59:53 +01:00
Michael
1212009282 Some small CSS fix 2017-12-11 05:57:51 +00:00
Michael Vogel
042507e157
Merge pull request #471 from MrPetovan/task/3878-move-group-to-src
Move Group to src
2017-12-10 13:33:20 +01:00
Michael Vogel
89a17ae028
Merge pull request #472 from tobiasd/20171210-fr
FR translation uppdate - thx Thecross
2017-12-10 09:24:03 +01:00
Tobias Diekershoff
dd339a5eb3 numfriends translation update - thx Thecross 2017-12-10 08:49:30 +01:00
Tobias Diekershoff
18185e7055 notifyall FR translation added - thx Thecross 2017-12-10 08:47:29 +01:00
Hypolite Petovan
6e6f64a537 Remove references to include/group.php 2017-12-09 13:50:44 -05:00
Hypolite Petovan
2dc299ff17 Use new Model methods for group 2017-12-09 13:50:29 -05:00
Michael Vogel
95facaefc7
Merge pull request #470 from friendica/revert-469-revert-468-task/3878-move-objects-to-src
Revert "Revert "Move objects to src""
2017-12-08 06:20:29 +01:00
Hypolite Petovan
31823eb729
Revert "Revert "Move objects to src"" 2017-12-08 00:18:01 -05:00
Michael Vogel
e6c622d89d
Merge pull request #469 from friendica/revert-468-task/3878-move-objects-to-src
Revert "Move objects to src"
2017-12-08 05:24:56 +01:00
Michael Vogel
cf45cafea2
Revert "Move objects to src" 2017-12-08 05:24:41 +01:00
Michael Vogel
0ce8f2cd48
Merge pull request #468 from MrPetovan/task/3878-move-objects-to-src
Move objects to src
2017-12-08 05:02:15 +01:00
Hypolite Petovan
6ca14b4678 Reformatting of Twitter 2017-12-07 20:47:53 -05:00
Hypolite Petovan
7857d1e4a0 Massive reformatting of StatusNet
- Fixed unreachable code line 1550
- Renamed the relevant use statements
2017-12-07 20:47:23 -05:00
Hypolite Petovan
34396fedfe Move Objects to Model
- Object\Photo -> Object\Image and Model\Photo
- Object\Contact -> Model\Contact
- Model\GlobalContact -> Model\GContact
2017-12-07 20:16:42 -05:00
Hypolite Petovan
be1342fe5d
Merge pull request #467 from tobiasd/20171207-execs
some files were executable, now they are not
2017-12-07 09:10:50 -05:00
Tobias Diekershoff
f8d9efe8c7 some files were executable, now they are not 2017-12-07 14:26:26 +01:00
Michael Vogel
bb89947ab8
Merge pull request #466 from tobiasd/20171207-fr
rendertime: forgot to add the messages.po file for FR translation
2017-12-07 10:15:05 +01:00
Tobias Diekershoff
a0e725de0a rendertime: forgot to add the messages.po file for FR translation 2017-12-07 09:30:21 +01:00
Michael Vogel
5d1c7130c0
Merge pull request #465 from tobiasd/20171207-lng
some translation work for the addons
2017-12-07 07:37:33 +01:00
Tobias Diekershoff
b300bef96f added DE translation of xmpp 2017-12-07 07:29:55 +01:00
Tobias Diekershoff
e064d2da84 added DE translation of IFTTT 2017-12-07 07:29:41 +01:00
Tobias Diekershoff
25a7ca76f5 updated FR translation of rendertime addon 2017-12-07 07:28:27 +01:00
Hypolite Petovan
e4b38a30e9
Merge pull request #464 from zeroadam/ConfigFalse
Update false evaluations
2017-12-06 16:31:00 -05:00
Adam Magness
e1bb463ba9 Default param
use that default parameter!!!
2017-12-06 16:27:55 -05:00
Adam Magness
cdc69179fa Update false evaluations
update false to is_null where needed.
2017-12-06 16:02:21 -05:00
Michael Vogel
f974346d9a
Merge pull request #463 from tobiasd/20171206-rmtgz
deleted forgotten TGZ file
2017-12-06 13:21:19 +01:00
Tobias Diekershoff
e82aedfa82 deleted forgotten TGZ file 2017-12-06 11:29:22 +01:00
Michael Vogel
82e8e64d88
Merge pull request #462 from MrPetovan/task/3942-move-user-to-src
Move include/user to src
2017-12-04 10:33:01 +01:00
Hypolite Petovan
8bfe13246d Remove needless parentheses 2017-12-04 02:47:08 -05:00
Hypolite Petovan
780481528d Update function calls
- Add use statement
- Remove require
2017-12-03 22:38:52 -05:00
Hypolite Petovan
51e43d6dca Fix ldapauth formatting 2017-12-03 22:38:03 -05:00
Tobias Diekershoff
e1c67f3bf4
Merge pull request #461 from annando/bugfix-photo
Some more old photos ...
2017-12-02 12:38:27 +01:00
Michael Vogel
7a447e507e
Merge pull request #460 from MrPetovan/task/3942-add-user-authenticate
Use User::authenticate
2017-12-02 09:05:18 +01:00
Michael
56bc1bae18 Some more old photos ... 2017-12-02 08:03:59 +00:00
Hypolite Petovan
eadf7066e0 Use User::authenticate in addons
- dav
- jappixmini
- windowsphonepush
2017-12-01 23:03:49 -05:00
Hypolite Petovan
46e09b0544 Fix formatting
- dav
- jappixmini
- windowsphonepush
2017-12-01 22:55:48 -05:00
Hypolite Petovan
3a1b172d08
Merge pull request #459 from annando/bugfix-photo
Some includes hadn't been removed
2017-12-01 18:16:44 -05:00
Michael
e8975125cf Some includes hadn't been removed 2017-12-01 22:37:46 +00:00
Michael Vogel
cdfa834f05
Merge pull request #458 from zeroadam/Photo-#3878
Photo to namespace
2017-12-01 05:30:34 +01:00
Adam Magness
797f0c4ca2 Update Function call
update function call for Photo class.
2017-11-30 07:42:34 -05:00
Adam Magness
7b6bc4777c Updates
Updates from review changes to main friendica project
2017-11-29 17:38:05 -05:00
Adam Magness
30fa9ac76c Photo to namespace
updates for Photo class moving to Friendica\Object namespace.
2017-11-29 12:38:39 -05:00
Michael Vogel
83f427a577
Merge pull request #457 from tobiasd/20171127-langXMPPandIFTTT
added messages.po files to IFTTT and XMPP addons
2017-11-27 10:26:04 +01:00
Tobias Diekershoff
12e314871c added messages.po files to IFTTT and XMPP addons as hinted in #454 2017-11-27 09:33:50 +01:00
Tobias Diekershoff
cec3a598c9
Merge pull request #456 from annando/template_escape
The function "template_escape" doesn't exist anymore.
2017-11-27 07:41:45 +01:00
Michael
f2c57fda48 The function "template_escape" doesn't exist anymore. 2017-11-27 06:34:04 +00:00