2304 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	4ceec855d2	Merge pull request #479 from MrPetovan/bug/4046-remove-group_member-uid ... Remove group_member.uid in pumpio	2017-12-16 04:06:47 +01:00
Hypolite Petovan	58495893b9	Remove group_member.uid in pumpio	2017-12-14 22:52:08 -05:00
Michael Vogel	cb9926c93a	Merge pull request #478 from friendica/revert-477-revert-475-task/4041-fix-register ... Revert "Revert "Use Exceptions for User::create""	2017-12-13 20:01:48 +01:00
Michael Vogel	fc62d44e78	Revert "Revert "Use Exceptions for User::create""	2017-12-13 20:01:25 +01:00
Tobias Diekershoff	28603f86e8	Merge pull request #477 from friendica/revert-475-task/4041-fix-register ... Revert "Use Exceptions for User::create"	2017-12-13 12:13:17 +01:00
Tobias Diekershoff	97844e1bab	Revert "Use Exceptions for User::create"	2017-12-13 12:05:31 +01:00
Tobias Diekershoff	726db2c83f	Merge pull request #475 from MrPetovan/task/4041-fix-register ... Use Exceptions for User::create	2017-12-13 10:37:24 +01:00
Tobias Diekershoff	3b7fe33f8e	Merge pull request #476 from fabrixxm/communityhome ... community home: add admin settings form	2017-12-13 10:36:27 +01:00
GLComo	e433625e0b	community home: add admin settings form	2017-12-13 09:42:22 +01:00
Hypolite Petovan	f834d1d145	Use Exceptions for User::create	2017-12-12 21:17:46 -05:00
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