967ecb4205
Merge remote-tracking branch 'upstream/develop' into 1610-performance
...
Conflicts:
include/Core/Config.php
include/Core/PConfig.php
2016-10-25 16:16:01 +00:00
Michael Vogel
75a996c4e4
Merge pull request #2839 from Hypolite/Issue-#2822
...
Issue #2822 - Fix [Embedded content - reload the page to view]
2016-10-25 07:31:20 +02:00
Hypolite Petovan
9ef63efa1c
Leave formatting alone
2016-10-24 16:16:49 -04:00
Hypolite Petovan
fb75394766
Some more formatting reverts
2016-10-24 12:43:38 -04:00
Hypolite Petovan
8787587011
Fix undiscriminate spaces=>tabs replace
2016-10-24 12:34:10 -04:00
Hypolite Petovan
789e1f4275
Revert some more unwarranted formatting
2016-10-24 12:27:27 -04:00
Michael Vogel
3463a442ba
Merge remote-tracking branch 'upstream/develop' into 1610-performance
2016-10-24 08:12:13 +00:00
Michael Vogel
8cab3b5592
More transactions, more queries on uncommitted data
2016-10-24 08:10:27 +00:00
Michael Vogel
ee5ada6991
We now use memcache if configured and installed.
2016-10-23 21:59:40 +00:00
Hypolite Petovan
2741726402
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
Michael Vogel
561f45b83b
And again ...
2016-10-22 10:33:18 +00:00
Michael Vogel
b429b85680
CSR changes, split dbclean in separate processes if worker is active
2016-10-22 10:14:41 +00:00
Michael Vogel
4c5a7fac83
Some stuff to make Hypolite happy :)
2016-10-21 21:32:27 +00:00
Michael Vogel
b56bdf06ed
Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check
2016-10-21 21:17:58 +00:00
Michael Vogel
501c45def5
Some more improved queries
2016-10-21 18:25:21 +00:00
Michael Vogel
fd2d8cc180
Orphans are removed without giant lock problems
2016-10-20 22:05:21 +00:00
Michael Vogel
abb827b784
Merge remote-tracking branch 'upstream/develop' into 1610-performance
2016-10-20 08:44:19 +00:00
Michael Vogel
493d7bc698
Remove orphaned data
2016-10-19 21:06:37 +00:00
Michael Vogel
356414846b
Check for duplicated postings from connectors
2016-10-17 19:17:11 +00:00
Michael Vogel
3e5cf5290e
Improved queries, more uncommitted queries
2016-10-17 18:38:51 +00:00
Michael Vogel
e09c55527c
Merge pull request #2856 from rabuzarus/0510-update_fullcalendar
...
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 18:04:11 +02:00
rabuzarus
8064ff6ecb
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 16:04:53 +02:00
Michael Vogel
e5c7ce0902
Use "last-item" in the contact table instead of an expensive sql query
2016-10-14 05:45:32 +00:00
Hypolite Petovan
a843858654
Merge from develop
2016-10-08 13:45:14 -04:00
Michael Vogel
b70676d231
Optimized query for nodeinfo and admin user page
2016-10-07 21:07:21 +00:00
Michael Vogel
6abac720e2
Small performance tweaks for "item_store" as well.
2016-10-07 06:05:43 +00:00
Michael Vogel
f9b9ee6b77
Increased performance when storing items
2016-10-06 21:24:29 +00:00
Michael Vogel
aca6f63985
Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo
2016-10-05 16:19:42 +00:00
Michael Vogel
5fb2e47809
Increased performance when storing items
2016-10-05 16:12:53 +00:00
rabuzarus
2a3e235f9a
show/hide page-flags according to the account-type
2016-10-05 14:45:19 +02:00
Michael Vogel
8cde8b375b
Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type
2016-10-04 03:52:22 +00:00
Michael Vogel
66bec9475d
Improved queries for the nodeinfo functionality and the admin page
2016-10-04 03:51:13 +00:00
Michael Vogel
095fa872ed
Contact Type is now transmitted via poco
2016-10-04 03:48:01 +00:00
Michael Vogel
860f11e71b
Merge pull request #2842 from tobiasd/20160929-lng
...
lang handling for #2752
2016-10-04 05:22:38 +02:00
Hypolite Petovan
d9a5554543
Fix Issue #2822 - Add new setting to user settings page
...
- Convert formatting to PSR-2
- Add new bandwitdh saver setting
2016-10-02 15:25:10 -04:00
Hypolite Petovan
08a30bc1c6
Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting
...
- Fix formatting according to PSR-2
- Add bandwitdh_saver setting check before replacing with "Embedded
content - Please reload"
2016-10-02 15:23:05 -04:00
Michael Vogel
6d16c39b7e
dbstructure now switches in the maintenance mode when updating
2016-10-02 13:52:52 +00:00
rabuzarus
fa33f94b29
Merge pull request #2830 from annando/1610-account_type
...
The account type is now read and displayed
2016-10-02 14:55:52 +02:00
Michael Vogel
60a0235af0
The account type is now read and displayed
2016-10-01 20:03:27 +00:00
5cfca894c1
On registration use the browser preferred language for the new account
2016-10-01 15:55:56 +02:00
7aa4f5297d
when the admin creates a new account, use the system language for this accounts
2016-10-01 15:55:18 +02:00
Hypolite Petovan
f0382bb159
Restore admin notification email on register approval
...
- Reverted changes to mod/register.php
- Added "show_in_notification_page" flag to prevent `notify` DB
insertion
2016-09-30 08:57:16 -04:00
Hypolite Petovan
aa985502c9
Fix Issue #2813
...
- Remove adding a notification for each admin on register approval
request
- Fix wrong display of the above notification that is removed anyway
- Fix comments
2016-09-29 23:17:35 -04:00
Michael Vogel
2f06e9360f
"Company" is now "Organisation" and there is an auto update
2016-09-26 19:35:01 +00:00
Michael Vogel
d632d282cd
We are now having an account type and are publishing it
2016-09-25 20:37:27 +00:00
Michael Vogel
196eb6009f
The XMPP address is now in the profile and will be transmitted
2016-09-25 15:28:00 +00:00
Michael Vogel
3f35fed35a
Special characters should be escaped
2016-09-23 06:29:02 +00:00
e5c2c66487
Show the worker queue count if the workers are active
2016-09-20 15:45:55 +02:00
f85821839b
display current state of PHP logging in admin panel logging informations
2016-09-13 22:52:21 +02:00
Michael Vogel
1bfdc216d0
Only close the session if it had been opened.
2016-08-16 21:35:12 +02:00
