Hypolite Petovan
|
991b62784a
|
Remove spaces confusing jSmart in contact_template
- Fix two missing button closing tags
|
2017-03-21 22:39:29 -04:00 |
|
|
Hypolite Petovan
|
8a0b057dc7
|
Merge branch 'develop' into improvement/frio-action-links-to-buttons
|
2017-03-20 14:43:37 -04:00 |
|
|
Hypolite Petovan
|
7a95fcf02a
|
Merge pull request #3241 from rabuzarus/20170316_-_fix_event_edit
add dop event & fix event edit
|
2017-03-20 13:18:18 -04:00 |
|
rabuzarus
|
0557a42e2f
|
add missed NULL_DATE
|
2017-03-20 17:19:24 +01:00 |
|
|
rabuzarus
|
d1d33dc79a
|
Merge origin/20170316_-_fix_event_edit into 20170316_-_fix_event_edit
Conflicts:
mod/events.php
|
2017-03-20 17:16:39 +01:00 |
|
|
rabuzarus
|
0879b46125
|
add NULL_DATE & coding standard work
|
2017-03-20 16:59:21 +01:00 |
|
|
rabuzarus
|
0060e2449e
|
Merge develop into 20170316_-_fix_event_edit
Conflicts:
mod/events.php
|
2017-03-20 16:46:36 +01:00 |
|
|
Hypolite Petovan
|
8f7d191bfc
|
Merge branch 'develop' into 20170316_-_fix_event_edit
|
2017-03-20 11:08:07 -04:00 |
|
Michael Vogel
|
eaf308ad01
|
Merge pull request #3250 from tobiasd/20170320-msg
regenerated master messages.po file
|
2017-03-20 08:40:37 +01:00 |
|
 Tobias Diekershoff
|
8bd8e858d0
|
regenerated master messages.po file
|
2017-03-20 08:27:10 +01:00 |
|
|
Tobias Diekershoff
|
3021254f85
|
Merge pull request #3247 from annando/issue-3242-b
If the maintenance reason is a url, then redirect to this address
|
2017-03-20 07:20:23 +01:00 |
|
 Michael
|
62915007c6
|
Test code removed
|
2017-03-20 04:37:59 +00:00 |
|
|
Michael
|
aa4f9c985f
|
Enhanced explanation
|
2017-03-20 04:37:13 +00:00 |
|
|
Hypolite Petovan
|
46c5b3b419
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into improvement/frio-action-links-to-buttons
|
2017-03-19 21:12:20 -04:00 |
|
|
Hypolite Petovan
|
28b3fa4f1f
|
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
|
2017-03-19 21:10:41 -04:00 |
|
|
Hypolite Petovan
|
8c8b8c32d9
|
Merge pull request #3249 from annando/bugfix-dbstructure
Bugfix for issue 3242 - forgotten "use"
|
2017-03-19 21:00:55 -04:00 |
|
|
Michael
|
b42a977894
|
Bugfix for issue 3242 - forgotten "use"
|
2017-03-19 22:58:35 +00:00 |
|
|
Michael
|
24ee60492b
|
If the maintenance reason is a url, then redirect to this address
|
2017-03-19 19:03:09 +00:00 |
|
|
Hypolite Petovan
|
65f809f5cb
|
Merge pull request #3245 from annando/issue-3242
Issue 3242: Define a maintenance reason
|
2017-03-19 11:06:25 -04:00 |
|
|
Hypolite Petovan
|
7dfe6d1580
|
Merge pull request #3243 from annando/1702-null-date
Datetime compatibility to MySQL restored
|
2017-03-19 11:03:32 -04:00 |
|
|
Michael
|
51f93346d6
|
Standards, like always
|
2017-03-19 14:57:36 +00:00 |
|
|
Michael
|
e93825b9f0
|
Some more standards
|
2017-03-19 14:43:24 +00:00 |
|
|
Michael
|
8dd732a896
|
Issue 3242: Define a maintenance reason
|
2017-03-19 13:24:07 +00:00 |
|
|
Michael
|
b06d787130
|
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
|
2017-03-19 08:06:02 +00:00 |
|
|
Michael
|
132688d663
|
Standards, what else?
|
2017-03-19 08:04:04 +00:00 |
|
rabuzarus
|
080e2af882
|
Merge pull request #3244 from annando/bugfix-text
You shouldn't use a text variable like an array.
|
2017-03-19 00:51:57 +01:00 |
|
|
Michael
|
fb5f1f61fc
|
You shoudln't use a text variable like an array.
|
2017-03-18 23:32:59 +00:00 |
|
|
Michael
|
1a436264cd
|
Some standards
|
2017-03-18 12:13:43 +00:00 |
|
|
Michael
|
222550e784
|
From now on we are using 0001-01-01 as lowest date
|
2017-03-18 11:42:54 +00:00 |
|
|
Michael
|
62ccb4499a
|
Some more unneeded changes reverted
|
2017-03-18 08:54:25 +00:00 |
|
|
Michael
|
a2a171af06
|
"dob" is not a date field, so the changes are reverted
|
2017-03-18 08:50:27 +00:00 |
|
|
Michael
|
e301fa0832
|
Merge remote-tracking branch 'upstream/develop' into 1702-null-date
|
2017-03-18 08:31:43 +00:00 |
|
|
Tobias Diekershoff
|
909e1e055f
|
Merge pull request #3228 from annando/1702-detect-server
Server type detection is improved
|
2017-03-18 09:10:03 +01:00 |
|
|
rabuzarus
|
497df57ef7
|
more standards work
|
2017-03-18 04:41:54 +01:00 |
|
|
Hypolite Petovan
|
8d6d008d28
|
Fix frio style.css indentation
|
2017-03-17 20:46:31 -04:00 |
|
|
Hypolite Petovan
|
20406aacec
|
All-around CSS display fixes
|
2017-03-17 20:28:31 -04:00 |
|
|
Hypolite Petovan
|
2e17885eb3
|
Fix jot display
|
2017-03-17 20:28:09 -04:00 |
|
|
Hypolite Petovan
|
80510ef4ca
|
Fix group_side display
|
2017-03-17 20:28:00 -04:00 |
|
|
Hypolite Petovan
|
d1a1dfe879
|
Fix profile display
|
2017-03-17 20:27:43 -04:00 |
|
|
Hypolite Petovan
|
03700d4ae5
|
Fix contact display
|
2017-03-17 20:27:31 -04:00 |
|
|
Hypolite Petovan
|
92a755f688
|
Fix event display
|
2017-03-17 20:27:17 -04:00 |
|
|
Hypolite Petovan
|
29936060cf
|
Fix filebrowser display
|
2017-03-17 20:26:40 -04:00 |
|
|
Michael
|
f3bcf63d46
|
Standards and some logging improvements
|
2017-03-17 19:25:01 +00:00 |
|
|
rabuzarus
|
e1d22ef5d4
|
some code cleanup
|
2017-03-17 19:10:48 +01:00 |
|
|
rabuzarus
|
c785eb29c6
|
more work on standards compliance
|
2017-03-17 17:57:57 +01:00 |
|
|
Michael
|
87771cf617
|
Merge remote-tracking branch 'upstream/develop' into 1702-detect-server
Conflicts:
include/discover_poco.php
|
2017-03-17 15:53:19 +00:00 |
|
|
rabuzarus
|
3cef98caf6
|
Merge pull request #3226 from annando/1702-only-worker
The worker is now the only background processing system
|
2017-03-17 13:22:23 +01:00 |
|
|
rabuzarus
|
1dd839c2c2
|
Merge pull request #3240 from annando/bugfix-dba
Bugfix: When a query fails we mustn't use the result value.
|
2017-03-17 13:20:56 +01:00 |
|
|
Hypolite Petovan
|
8ac8d779f6
|
Fix bulk drop button
|
2017-03-16 22:19:45 -04:00 |
|
|
Hypolite Petovan
|
67c40bf030
|
Fix "Mark all as seen" button display
|
2017-03-16 22:19:27 -04:00 |
|