harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 1c61e316b4 Block export and re-import works. Fixed bug where layout content was not being imported properly. Andrew Manning 2016-08-20 21:08:15 -04:00
  • 2d42d58738 Layouts list and are selectable for export to the zip file Andrew Manning 2016-08-20 16:05:27 -04:00
  • 80ed05d45d Export of pages and their layouts to a zip file works. Bug on importing the exported zip file for pages. Andrew Manning 2016-08-20 15:22:30 -04:00
  • 4cf172d46f Merge branch 'zp' into dev redmatrix 2016-08-19 17:39:08 -07:00
  • d1fa63b389 string update redmatrix 2016-08-19 17:13:34 -07:00
  • 9fe4bae52f block backdoor delivery of bulk imported items redmatrix 2016-08-19 17:12:48 -07:00
  • cf93d9c3b4 Merge remote-tracking branch 'upstream/dev' into website-export Andrew Manning 2016-08-19 19:34:04 -04:00
  • 40a7d38210 Pages populate the available-to-export list. New checkbox class for smaller boxes. Andrew Manning 2016-08-19 19:32:52 -04:00
  • e4244c0cac remove insecure repository warning. redmatrix 2016-08-18 17:22:54 -07:00
  • 3c88f3e6ee Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-17 19:45:00 -07:00
  • fa98f4c55d import anomaly redmatrix 2016-08-17 19:44:24 -07:00
  • f2e87a204d Progress implementing zip file export Andrew Manning 2016-08-17 21:25:50 -04:00
  • c98b91f514 Stash changes for merge with dev Andrew Manning 2016-08-17 18:19:36 -04:00
  • 15d9bf4ebe Updating Spanish and Dutch strings jeroenpraat 2016-08-17 17:37:21 +02:00
  • 6dd4e9ac60 Merge pull request #493 from phellmes/de20160817 hubzilla 2016-08-17 20:44:05 +10:00
  • 2b0c2891e3 Update DE translation strings phellmes 2016-08-17 10:39:21 +02:00
  • 7939588702 Merge pull request #492 from wave72/dev hubzilla 2016-08-17 18:28:27 +10:00
  • 99c4d932bf Updated Italian strings Wave72 2016-08-17 10:25:42 +02:00
  • 537401cf27 don't set session theme unless logged in. redmatrix 2016-08-16 22:15:51 -07:00
  • b2eede891a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-16 19:01:20 -07:00
  • a2873c18ca get rid of ugly code construct redmatrix 2016-08-16 19:00:38 -07:00
  • 70d38fe5b3 Merge pull request #491 from mjfriaza/dev hubzilla 2016-08-17 09:12:02 +10:00
  • f15456f4ab Add Spanish context help settings/features page Manuel Jiménez Friaza 2016-08-16 13:06:51 +02:00
  • 9fc4246e1d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev Mario Vavti 2016-08-16 08:05:53 +02:00
  • 291b0edbe0 rename limited -> custom Mario Vavti 2016-08-16 08:05:46 +02:00
  • 452c4d13b0 remove unneeded function Mario Vavti 2016-08-16 07:54:24 +02:00
  • 70150718c5 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-15 22:46:06 -07:00
  • 8a89cfb158 move schema settings into the display settings main so we can set theme:schema theme selectors in settings redmatrix 2016-08-15 22:45:07 -07:00
  • 86d2daf473 only check settings-form for dirty state and remove redundant javascript Mario Vavti 2016-08-16 07:41:06 +02:00
  • fbb357ac47 Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes. redmatrix 2016-08-15 17:18:42 -07:00
  • 38de583db0 Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes. redmatrix 2016-08-15 17:18:42 -07:00
  • 7fc254a81c Use double quotes for strings passed via templates to javascript. Some translated strings have unescaped single quotes. redmatrix 2016-08-15 17:18:42 -07:00
  • 752bb169ed Merge pull request #487 from git-marijus/dev hubzilla 2016-08-16 06:59:52 +10:00
  • 4b101c2240 provide group options serverside and minor cleanup Mario Vavti 2016-08-15 22:54:07 +02:00
  • 055ee75302 Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC_merge redmatrix 2016-08-15 13:19:34 -07:00
  • f95011a565 Merge dev with last changes of homeinstall script in master Einer von Vielen 2016-08-15 20:12:00 +02:00
  • 4facae674d fix attached photo/file permissions on clones redmatrix 2016-08-15 13:18:25 -07:00
  • 39005634c6 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge redmatrix 2016-08-15 13:18:05 -07:00
  • 2e452f5b27 Merge pull request #488 from einervonvielen/dev_homeinstall_merge_master-dev hubzilla 2016-08-16 06:17:44 +10:00
  • 9e9e0ebb1c Merge dev with last changes of homeinstall script in master Einer von Vielen 2016-08-15 20:12:00 +02:00
  • dd8d20f089 implement groups in the acl select. please notice that selecting *custom selection* now sets an empty (public) acl. it was set to self before... Mario Vavti 2016-08-15 18:52:27 +02:00
  • 6bb5ea7a81 Merge branch '1.12RC' of https://github.com/redmatrix/hubzilla into 1.12RC Mario Vavti 2016-08-15 11:22:20 +02:00
  • efcde8f3dd update bootstrap 3.3.5 > 3.3.7 Mario Vavti 2016-08-14 11:49:40 +02:00
  • 057266653b fix javascript error if not logged in Mario Vavti 2016-08-14 12:12:37 +02:00
  • 8cbffdf0b4 s/$rr/$rv/ redmatrix 2016-08-14 22:44:25 -07:00
  • 000861da0d event_store_event hook redmatrix 2016-08-14 18:22:18 -07:00
  • 7ae097ef6b Merge pull request #484 from anaqreon/settings-context hubzilla 2016-08-15 06:32:30 +10:00
  • 6868403383 Context help for settings/features page Andrew Manning 2016-08-14 13:34:52 -04:00
  • d1cb925b59 Merge pull request #482 from anaqreon/nocomment hubzilla 2016-08-14 21:24:24 +10:00
  • 229cc2ac43 Change text for submenu on small screens to be static toggle statement Andrew Manning 2016-08-14 06:55:02 -04:00
  • cb9ac6dd34 Replace hardcoded button title in javascript to translatable text Andrew Manning 2016-08-14 06:46:48 -04:00
  • 2e7f4c1870 Added a disable comments setting to the "Additional features" settings with a corresponding post editor toggle button Andrew Manning 2016-08-14 06:41:12 -04:00
  • 993b182f81 fix javascript error if not logged in Mario Vavti 2016-08-14 12:12:37 +02:00
  • 82d61f194a update bootstrap 3.3.5 > 3.3.7 Mario Vavti 2016-08-14 11:49:40 +02:00
  • 2755c74c29 btn/dropdown rendering issue Mario Vavti 2016-08-14 11:31:00 +02:00
  • 541d0dce90 btn/dropdown rendering issue Mario Vavti 2016-08-14 11:31:00 +02:00
  • 5ad5afe63b Merge pull request #481 from anaqreon/issue-475 hubzilla 2016-08-14 09:54:12 +10:00
  • 2c3843ee4c remove js debugging Mario Vavti 2016-08-13 22:27:53 +02:00
  • 6f0ac133cc remove js debugging Mario Vavti 2016-08-13 22:27:53 +02:00
  • e5d1dd111e fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript Mario Vavti 2016-08-13 22:17:47 +02:00
  • 1b90e851f9 fix #480, enable bbcode autocomplete for photo comments and remove some redundant javascript Mario Vavti 2016-08-13 22:17:47 +02:00
  • 125713e938 Fix for older photos not being embedded by the embedphotos tool. Andrew Manning 2016-08-13 14:38:13 -04:00
  • e128ff4e8f Fixed bug preventing images in root photo album from loading in embedphotos dialog. Andrew Manning 2016-08-13 14:20:41 -04:00
  • 2c8a82713e pending flag not being reset when using autoperms from custom role redmatrix 2016-08-12 18:17:39 -07:00
  • 165f442d70 pending flag not being reset when using autoperms from custom role redmatrix 2016-08-12 18:17:39 -07:00
  • 5365e9b3a5 string update redmatrix 2016-08-12 14:45:16 -07:00
  • 7d2a17ea6e fix auto-connect setting zottel 2016-08-12 23:27:03 +02:00
  • 91b8c769bd possible quickfix for multi-acl not honoring jotnets Mario Vavti 2016-08-12 17:40:22 +02:00
  • 2aa1450ab2 Merge pull request #479 from git-marijus/dev hubzilla 2016-08-13 07:37:45 +10:00
  • dc3cc655db fix auto-connect setting zottel 2016-08-12 23:27:03 +02:00
  • e4bdc92834 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-08-12 20:43:05 +02:00
  • 87a74a44d3 possible quickfix for multi-acl not honoring jotnets Mario Vavti 2016-08-12 17:40:22 +02:00
  • ebbe18a426 better method of dealing with api versions redmatrix 2016-08-11 20:09:38 -07:00
  • 6bc5dd75bd more cleanup of api redmatrix 2016-08-11 19:42:44 -07:00
  • 0257d660ad move error processing back inside the function redmatrix 2016-08-11 18:09:48 -07:00
  • 0637a71669 embed filter adjustments redmatrix 2016-08-11 17:33:28 -07:00
  • c63deda71a embed filter adjustments redmatrix 2016-08-11 17:33:28 -07:00
  • 3ba4b2c1c1 A bit of api cleanup. Don't get excited. This is like a 0.005% cleanup but you have to start somewhere. redmatrix 2016-08-11 17:02:52 -07:00
  • 45dc995967 forum detection was off for forums with custom perms redmatrix 2016-08-10 20:49:51 -07:00
  • e985436b3b forum detection was off for forums with custom perms redmatrix 2016-08-10 20:49:51 -07:00
  • a8a3812890 optimise Onepoll so it doesn't try and fetch posts for a channel that we've not given permission to send us their stream and posts. Currently the posts are fetched, processed, and ultimately discarded. Since we know they are going to be discarded, there's not much point fetching them in the first place. redmatrix 2016-08-10 20:01:52 -07:00
  • 6c672d2575 initialise jot editor if it is used as a file drop target and isn't yet opened. redmatrix 2016-08-10 19:38:20 -07:00
  • 99c5aca78b update CHANGELOG for 1.12 redmatrix 2016-08-10 17:35:07 -07:00
  • d8240a40b7 update CHANGELOG for 1.12 redmatrix 2016-08-10 17:35:07 -07:00
  • b587bdf863 new version redmatrix 2016-08-10 16:57:14 -07:00
  • adf34fb201 update version redmatrix 2016-08-10 16:54:57 -07:00
  • 82e867a9a8 implement acl for folder creation Mario Vavti 2016-08-10 16:17:09 +02:00
  • 8706cbe1c4 Merge remote-tracking branch 'upstream/dev' into dev zottel 2016-08-10 13:49:48 +02:00
  • 7a557d31e0 open editor or comment window when linkdropping to a closed window. We probably also need this for filedropping. redmatrix 2016-08-10 01:35:58 -07:00
  • de12503fad allow dropping links on comments as well as posts redmatrix 2016-08-09 22:52:14 -07:00
  • 5238a27ab3 function order reversed redmatrix 2016-08-09 20:50:33 -07:00
  • 12162f53b4 You can drag links to the editor (which will be parsed and inserted); as well as files (which will be uploaded) redmatrix 2016-08-09 18:13:54 -07:00
  • ec3ca11d0d bad code format redmatrix 2016-08-09 16:59:35 -07:00
  • 07dca90352 updates to hcard parsing redmatrix 2016-08-07 21:00:23 -07:00
  • 3338f3c5b2 diaspora vcard updates redmatrix 2016-08-07 20:16:14 -07:00
  • de455e4cd0 server roles redmatrix 2016-08-07 17:40:56 -07:00
  • 5243dd153b use config system.server_role and deprecate 'UNO' redmatrix 2016-08-07 17:29:35 -07:00
  • e1659b0725 fix cloud path redmatrix 2016-08-07 16:21:51 -07:00
  • 89c026924b fix /cloud upload for images Mario Vavti 2016-08-06 14:40:23 +02:00
  • 4f0b138692 bring back acl for cloud file uploads Mario Vavti 2016-08-06 12:46:10 +02:00