Commit Graph

16180 Commits

Author SHA1 Message Date
Mikael Nordfeldth
5a3a3420e3 Merge commit 'refs/merge-requests/56' of https://gitorious.org/social/mainline into merge-requests/56 2015-03-09 10:39:27 +01:00
digital dreamer
a452a3b1a0 Snapshot of the Transifex translation project - February 2015 2015-03-08 09:34:38 +01:00
Mikael Nordfeldth
5c6b98e821 Bug tracker link updated. 2015-03-01 16:48:31 +01:00
Mikael Nordfeldth
561e098b53 1.1.3 not 1.1.3 beta3 2015-02-27 10:15:23 +01:00
Mikael Nordfeldth
c81cd18796 I hereby dub thee 1.1.3 - The Spanish Invasion 2015-02-27 09:58:38 +01:00
Mikael Nordfeldth
d524ad8b59 Pass Profile to asAtomEntry 2015-02-27 09:57:49 +01:00
Mikael Nordfeldth
61992dd9a2 CSS to align the notice footer (thanks fnadde42) 2015-02-13 12:10:25 +01:00
Mikael Nordfeldth
b3e80f5c32 Updated README.md and framework.php 2015-02-13 12:09:12 +01:00
Mikael Nordfeldth
6620ad793a Deja vu of user->getProfile() from 4f9b70d 2015-02-13 11:55:37 +01:00
Mikael Nordfeldth
e9457db8b2 DirectMessages backed up properly for UAS 2015-02-13 11:54:15 +01:00
Mikael Nordfeldth
44191ac81a Faves backed up properly to UAS 2015-02-13 11:52:29 +01:00
Mikael Nordfeldth
4f9b70d51f Profile expected in Notice::asActivity from UAS 2015-02-13 11:41:21 +01:00
Mikael Nordfeldth
cdf2b28854 UAS protected property user solved with getUser() 2015-02-13 11:39:50 +01:00
Mikael Nordfeldth
a063bb43a8 EndSetApiUser will always contain a User 2015-02-13 01:19:59 +01:00
Mikael Nordfeldth
69e04e5cbd extlib Michelf\Markdown updated 1.4.0 to 1.4.1 2015-02-12 22:46:25 +01:00
Mikael Nordfeldth
a66973e158 DB_DataObject updated to 1.11.3 2015-02-12 22:42:10 +01:00
Mikael Nordfeldth
10f2cde0b1 DB updated to 1.8.2 2015-02-12 22:42:00 +01:00
Mikael Nordfeldth
35a9c65e4a htmLawed extlib updated from 1.1.16 to 1.1.19 2015-02-12 21:50:21 +01:00
Mikael Nordfeldth
f5bb0431da schemaDef coding style fixes 2015-02-12 17:45:02 +01:00
Mikael Nordfeldth
13f1c2cc55 Missing uri property of QnA_Answer class 2015-02-12 17:44:05 +01:00
Mikael Nordfeldth
5478e387db Added note on socialfying for HTTPS sites. 2015-02-12 11:08:08 +01:00
Mikael Nordfeldth
2688b45b57 Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into merge-requests/43 2015-02-12 11:03:39 +01:00
Mikael Nordfeldth
68df780c59 Clarify in INSTALL that MySQL must be 5.5+
lib/installer.php already said that when installing.
2015-02-12 10:41:55 +01:00
Adam Moore
7fb02674e5 Deleting redundant file. 2015-02-10 16:49:44 -08:00
Adam Moore
36d00ead33 Webfinger instructions were incomplete/erroneous -- now they are not. 2015-02-10 16:36:32 -08:00
Mikael Nordfeldth
a45cdae083 Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into merge-requests/41 2015-02-10 18:41:18 +01:00
Chimo
7cea3f9f11 Add 'statusnet_textarea' backward-compatibility 2015-02-10 10:53:24 -05:00
Mikael Nordfeldth
b52b9e1201 Merge commit 'refs/merge-requests/40' of https://gitorious.org/social/mainline into merge-requests/40 2015-02-10 00:30:20 +01:00
Chimo
56d431320d Replace one instance of LOG_ERR with LOG_DEBUG 2015-02-09 18:08:46 -05:00
Chimo
d816af9aa9 Prepopulate newnotice from URL arg 2015-02-09 18:06:26 -05:00
Mikael Nordfeldth
8726839372 GNU social SVG logo added to neo-gnu 2015-02-09 21:44:01 +01:00
Mikael Nordfeldth
3e0f395be6 neo-quitter unuglifying (thanks @marcus@gnusocial.ch )
also formatting changes to the CSS like removing trailing whitespace.
2015-02-09 20:26:39 +01:00
Mikael Nordfeldth
dc495a52ea Merge commit 'refs/merge-requests/39' of https://gitorious.org/social/mainline into merge-requests/39 2015-02-09 11:35:19 +01:00
Chimo
74d4e2fa10 TwitterBridge: don't array_merge() non-arrays
Fixes: ErrorException: [2] array_merge(): Argument #2 is not an array
2015-02-08 20:11:50 -05:00
Chimo
55321af4c8 Make TwitterBridge less noisy
Empty timelines are no longer warnings, but debug information
2015-02-08 20:07:23 -05:00
Mikael Nordfeldth
8616055959 Can now delete lists/peopletags (thanks MrB)
Reported on https://bugz.foocorp.net/T79
Fix by MrB: https://gist.github.com/mrvdb/0f5d84c9b56c0a390c4a
2015-02-08 23:48:35 +01:00
Mikael Nordfeldth
3a41dc4610 Merge commit 'refs/merge-requests/37' of https://gitorious.org/social/mainline into merge-requests/37 2015-02-08 23:21:28 +01:00
Mikael Nordfeldth
c6b1b3e5e3 Merge commit 'refs/merge-requests/30' of https://gitorious.org/social/mainline into merge-requests/30 2015-02-08 23:19:53 +01:00
Mikael Nordfeldth
fb9d32a8af Merge commit 'refs/merge-requests/31' of https://gitorious.org/social/mainline into merge-requests/31 2015-02-08 23:18:36 +01:00
Mikael Nordfeldth
39dce9e348 Merge commit 'refs/merge-requests/36' of https://gitorious.org/social/mainline into merge-requests/36 2015-02-08 23:11:47 +01:00
Chimo
e02bd34d26 Populate 'created' property on attention
The 'created' column in attention SQL table has NOT NULL
restriction.
2015-02-08 14:47:03 -05:00
Chimo
11053431d6 Populate 'created' property on ostatus_source
The 'created' column in ostatus_source SQL table has NOT NULL restriction.
INSERTs fail when running MySQL/MariaDB in strict mode if this is not
populated.
2015-02-08 13:41:29 -05:00
Mikael Nordfeldth
427a6e39ee added non-critical FIXMEs 2015-02-08 15:33:14 +01:00
Mikael Nordfeldth
59bbc81c4b updateWithKeys did not always COMMIT transactions 2015-02-08 15:17:50 +01:00
Mikael Nordfeldth
305ef6ad85 Older versions of PHP couldn't do array indexes on function returns. 2015-02-08 11:53:47 +01:00
Mikael Nordfeldth
1bda6fb9be General code quality improvement for easier understanding
Also made sure we only match local group IDs in recognizedFeed for PushhubAction
2015-02-08 11:47:15 +01:00
Mikael Nordfeldth
d4bdfc2aa2 Merge commit 'refs/merge-requests/33' of https://gitorious.org/social/mainline into merge-requests/33 2015-02-08 11:23:04 +01:00
Mikael Nordfeldth
4b77f88a17 Merge commit 'refs/merge-requests/34' of https://gitorious.org/social/mainline into merge-requests/34 2015-02-08 11:21:36 +01:00
Mikael Nordfeldth
0a599944e9 Merge commit 'refs/merge-requests/35' of https://gitorious.org/social/mainline into merge-requests/35 2015-02-08 11:20:53 +01:00
Mikael Nordfeldth
4c9a74cb12 ROLLBACK which may or may not be useful
There were problems with queries that were executed but didn't seem to
be committed. Trying to patch that up by calling a ROLLBACK on transactions
where the loading of the page isn't stopped after the BEGIN statement's
intended function fails (like with the rememberme cookie in this commit).
2015-02-08 11:09:19 +01:00