Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• f124f4a9f5 Merge branch 'master' into dev redmatrix 2016-04-15 00:49:17 -07:00
• a1af2cbb30 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-04-15 00:48:38 -07:00
• ec9e914798 revup + strings #337 redmatrix 2016-04-15 00:48:18 -07:00
• ec5bd9d679 Merge pull request #343 from wave72/master Wave 2016-04-15 09:31:38 +02:00
• c38c79d71c Merge branch 'redmatrix-master' Paolo Tacconi 2016-04-15 09:22:27 +02:00
• 45a854762b Resolved conflict in view/it/hstrings.php Paolo Tacconi 2016-04-15 09:20:58 +02:00
• 1806da0851 Updated Italian strings Paolo Tacconi 2016-04-15 09:09:59 +02:00
• 521641f3a8 filter out a bit more dreport noise - especially for private posts to multiple recipients. redmatrix 2016-04-14 21:51:18 -07:00
• a29c0371f1 commit 1.4 1.4 redmatrix 2016-04-14 20:11:36 -07:00
• a8f7af2079 provide general purpose verification class, remove include/session.php (no longer used) redmatrix 2016-04-14 18:51:06 -07:00
• 7ae7fac234 Merge branch 'master' into dev redmatrix 2016-04-14 17:35:47 -07:00
• d1fb4e9b03 revup #337 redmatrix 2016-04-14 17:34:08 -07:00
• ed0bff798b fix marked bug in code redmatrix 2016-04-13 22:58:37 -07:00
• 3f0bb1bb1d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-13 16:37:10 -07:00
• 9a0b61e4af refactor the js detection into a checkjs class which is only enabled on demand (currently only the channel and display pages). Will probably require a bit more work to hide/disable the cover photo when js is disabled. Have not actually tested without js to discover any other potential page issues. Have only confirmed that the detection class works and redirects to set a jsdisabled cookie and reload the page with that cookie+variable set if called from the channel page. redmatrix 2016-04-13 16:31:06 -07:00
• b81291cd5c some bbcode autocomplete refinement for edit webpage Mario Vavti 2016-04-13 11:56:43 +02:00
• a8a0ca8291 Merge branch 'master' into dev redmatrix 2016-04-13 01:02:23 -07:00
• 1c61be4113 issue #337 redmatrix 2016-04-13 01:01:01 -07:00
• 91cc365143 reverse the logic of the jsenabled setting so that sessions without js are performance penalised instead of regular sessions. redmatrix 2016-04-12 22:55:26 -07:00
• f4a27afee9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-12 19:42:02 -07:00
• be654f1769 Important work on the sessionhandler to maintain compatibility with php7 and php5x (x > 4) Merge branch 'master' into dev redmatrix 2016-04-12 19:40:19 -07:00
• 73628db7e2 revup issue #337 redmatrix 2016-04-12 18:43:50 -07:00
• 571c72f853 improve bbco autocomplete to not execute listNewLineAutocomplete() many times after many ajax page reloads Mario Vavti 2016-04-12 11:55:50 +02:00
• b788b38edf remove obsolete jotVideoURL() and jotAudioURL() redmatrix 2016-04-11 21:40:03 -07:00
• 09861abab7 when saving bookmarks from a post allow choice of bookmark to be saved (default is all of them); this implements the backend. Additional work will be required on the front end or within plugins to make this happen. redmatrix 2016-04-11 20:53:08 -07:00
• 202035fc68 move all DB session storage logic to SessionHandler where it belongs redmatrix 2016-04-11 19:19:58 -07:00
• 5ab1d509d2 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-11 13:04:17 -07:00
• 1b83d88fe6 remove references to ref_session_write - can't use redmatrix 2016-04-11 13:03:34 -07:00
• 482962648f whitespace Mario Vavti 2016-04-11 11:01:53 +02:00
• 326f3cfc85 Merge branch 'master' into dev redmatrix 2016-04-11 00:52:34 -07:00
• 4ba8526745 revup redmatrix 2016-04-11 00:50:50 -07:00
• 0269825bc0 localise the opensearch link redmatrix 2016-04-10 21:56:16 -07:00
• 5cb3143c04 issue #331 use timeago.js for reshared publish date instead of relative_date() which does not play well with other networks. redmatrix 2016-04-10 21:30:35 -07:00
• d1a2aecfa0 move more session related stuff such as paranoia handling (IP address changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions). redmatrix 2016-04-10 19:20:41 -07:00
• 0fe4957274 when setting the session handler as an object using the auto register shutdown flag, explicitly calling session_write_close() should no longer be required. It shouldn't cause any issues if it is called twice, but the session driver interface has been known to sometimes act in unexpected ways and there are lots of "subtleties" which can often be difficult to debug. The mentioned flag implies PHP 5.4 minimum but I believe we require that anyway. redmatrix 2016-04-10 17:42:32 -07:00
• e9f1bac062 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-10 17:03:30 -07:00
• 58692e3565 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-04-10 17:02:26 -07:00
• 7db733c9a0 revup redmatrix 2016-04-10 17:02:08 -07:00
• abfbe9c937 a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session. redmatrix 2016-04-10 16:56:08 -07:00
• f437705007 Update Dutch and Spanish jeroenpraat 2016-04-10 20:58:00 +02:00
• 46ed79c87a fix autocomplete for /channel and /display Mario Vavti 2016-04-09 12:27:36 +02:00
• e2b4d33627 some work on comanche autocomplete Mario Vavti 2016-04-09 12:16:42 +02:00
• 7690dca67b enable bbcode autocomplete for other places Mario Vavti 2016-04-09 09:24:14 +02:00
• c0bdcfedeb log if the session handler fails and surface the ssl_cookie config setting redmatrix 2016-04-08 05:10:36 -07:00
• 9b66b5eee3 objectify all the session management stuff redmatrix 2016-04-08 04:44:10 -07:00
• 2db59f3b76 Merge branch 'master' into dev redmatrix 2016-04-08 03:32:28 -07:00
• 44e21f6198 revup redmatrix 2016-04-08 03:31:32 -07:00
• 279f32b13d send file sync packets for all known file operations redmatrix 2016-04-07 18:54:48 -07:00
• 3a6187af3d implement updates of attach data to sync'd clones. redmatrix 2016-04-07 16:44:53 -07:00
• 516f776c94 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-07 16:25:16 -07:00
• cc62793d6f Merge branch 'master' into dev redmatrix 2016-04-07 16:24:59 -07:00
• d87daaedd1 revup issue #337 redmatrix 2016-04-07 16:23:57 -07:00
• cf84ff3344 translate the most common bbcodes to their *real name*. finally we should probably use an array for each bbcode containing the bbcode the real name and possibly a template for use as a peview in the dropdown Mario Vavti 2016-04-07 23:03:55 +02:00
• e419b2c18c some more autocompletion for bbcode tables - leave it open if we wanna use th or td though Mario Vavti 2016-04-07 11:34:38 +02:00
• 58324473a9 move li back in the list since it will be used far less than list Mario Vavti 2016-04-07 11:16:30 +02:00
• 62d842de31 Merge branch 'master' into dev redmatrix 2016-04-06 22:23:07 -07:00
• aa678ba0ff reset profile photo and cover photo bits for existing photos if a new one arrives from a clone redmatrix 2016-04-06 22:14:05 -07:00
• e4391e6336 missing profile photo in export data redmatrix 2016-04-06 21:36:47 -07:00
• aa0412d83b use the explicit form of build_sync_packet so that file/photo sync will work even when the actual observer is a guest (with permission to upload). redmatrix 2016-04-06 20:25:52 -07:00
• 861f5232d3 more work on file sync to clones, 60-70% test coverage, mostly working but many changes made during testing which themselves have not yet been tested redmatrix 2016-04-06 19:56:38 -07:00
• 9831ad515d file sync testing continued redmatrix 2016-04-06 18:46:29 -07:00
• 6650916435 file sync testing redmatrix 2016-04-06 18:38:48 -07:00
• 64cc0b794a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-06 18:08:06 -07:00
• 29363a185d file sync work redmatrix 2016-04-06 18:07:29 -07:00
• e41082dccc automate bbcode list creation even further Mario Vavti 2016-04-07 00:46:45 +02:00
• 97ccbf1bfb adjust the regex to also work with asteriks and use the simpler syntax for lists Mario Vavti 2016-04-06 22:18:59 +02:00
• a20ef706fd issue #340 redmatrix 2016-04-06 05:44:40 -07:00
• adad8f2ebc getting file sync data - missed parent folder redmatrix 2016-04-06 05:20:55 -07:00
• 0533db5d38 revup issue #337 redmatrix 2016-04-06 02:33:58 -07:00
• fb9c12df15 rework the "remember me" fix to be a bit less hackish redmatrix 2016-04-06 02:33:11 -07:00
• 5a2a8717e3 provide function to collect file/photo sync data per help/filesync redmatrix 2016-04-05 23:11:24 -07:00
• 0d50d29538 Merge branch 'master' into dev redmatrix 2016-04-05 22:15:29 -07:00
• 54aa998b52 undeclared static property App::$stringsave (push_lang() and pop_lang()) redmatrix 2016-04-05 22:13:56 -07:00
• 10f1e2d51b add some doco to getfile module redmatrix 2016-04-05 21:20:23 -07:00
• 9fd8634b62 server side of file/photo sync to deliver the file data. We'll sign it using our channel_hash and the current time to make it difficult to forge a request; as the sync process is not going to have magic-auth ability. redmatrix 2016-04-05 21:10:08 -07:00
• fd07940b10 provide stream resource pointer option to z_fetch_url() and z_post_url() per earlier doco commit on syncing files/photos across clones. redmatrix 2016-04-05 18:24:24 -07:00
• 6f6051f7e3 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-05 16:44:11 -07:00
• f9778fda83 add some doco on some of the issues and approaches to file/photo syncing and cloning redmatrix 2016-04-05 16:42:33 -07:00
• ea3fb53e4b Merge pull request #339 from anaqreon/autocomplete redmatrix 2016-04-06 06:07:32 +10:00
• a7d5bf6854 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-04-05 12:51:22 -07:00
• 0e7a963173 Merge branch 'master' into dev redmatrix 2016-04-05 12:51:06 -07:00
• 4aa2733699 revup issue #337 redmatrix 2016-04-05 12:49:58 -07:00
• 1eb6067c31 Improve (un)ordered list autocompletion for list construction Andrew Manning 2016-04-05 14:46:16 -04:00
• bd29551f9a fix contextual help Mario Vavti 2016-04-05 16:59:32 +02:00
• 32ccdd1f57 use min version of justifiedGallery Mario Vavti 2016-04-05 15:28:39 +02:00
• deaf0e99fd expand list of bbcode in autocomplete Mario Vavti 2016-04-05 15:27:45 +02:00
• d99a1d8de0 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-04-05 15:24:42 +02:00
• 0012030826 update upstream lib jusutifiedGallery Mario Vavti 2016-04-05 15:24:05 +02:00
• ec41170121 Merge pull request #338 from anaqreon/contextual-help redmatrix 2016-04-05 22:43:15 +10:00
• 1d5ea5efae explain the two aspects of federation which need to be handled in core to pass comments successfully amongst sites which optionally provide federation. Let's hope this list doesn't grow. redmatrix 2016-04-04 17:02:27 -07:00
• 01ad485f65 SECURITY: Do not link unknown and unverified code repositories to the project without some form of confirmation that one accepts the significant risks involved. redmatrix 2016-04-04 16:17:50 -07:00
• 447c59fd9b Merge branch 'master' into dev redmatrix 2016-04-04 13:32:58 -07:00
• 3de40bdf04 Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge redmatrix 2016-04-04 13:31:31 -07:00
• ba6c346b46 revup - issue #337 redmatrix 2016-04-04 13:30:59 -07:00
• 1c9f773900 Merge branch 'master' into dev Mario Vavti 2016-04-04 17:13:10 +02:00
• ec651f219e a simple autocomplete for bbcode or comanche - partly implemented Mario Vavti 2016-04-04 17:12:23 +02:00
• ee8a9384d5 Merge branch 'master' into dev Mario Vavti 2016-04-04 10:37:20 +02:00
• bba34a7a8e do not use dropdown class if there is nothing to dropdown Mario Vavti 2016-04-04 10:37:07 +02:00
• dfa12b2919 Merge branch 'master' into dev Mario Vavti 2016-04-04 10:13:30 +02:00
• 9b9f29a0b2 whitespace Mario Vavti 2016-04-04 10:10:19 +02:00