harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,241 Commits 6 Branches 36 Tags
afa9a62fa04fbafffe8caa198e67406c59bb545b
Commit Graph

10241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cvogeley afa9a62fa0 Merge pull request #448 from cvogeley/master 
Small adjustment
 2014-05-08 23:36:20 +02:00
Christian Vogeley 4b9c80aca9 Small adjustment 2014-05-08 23:33:04 +02:00
RedMatrix cd8095211f Merge pull request #447 from cvogeley/master 
Trying to make the conversation better readable
 2014-05-09 06:56:08 +10:00
Christian Vogeley 167e397706 Trying to make the conversation better readable 
by adding borders and adding more space between the threads. If you
don’t like it feel free to revert it.
 2014-05-08 22:41:13 +02:00
Paolo T b28b949e8f Merge pull request #446 from tuscanhobbit/master 
IT: strings updated
 2014-05-08 14:22:19 +02:00
Paolo Tacconi 2d17eeebcb IT: strings updated 2014-05-08 14:20:51 +02:00
friendica 1a4c99ec02 fix events until the new event subscription mechanism goes in, as shared events have been broken 2014-05-07 22:28:19 -07:00
friendica e22e94cd97 ok *now* shred works with alternate config files 2014-05-07 20:31:21 -07:00
friendica b26edefe3e shred: perhaps alternate configs will work now - unable to test at the moment. Was a typo in FriendicaOAuth.sh so it's unlikely anybody has been using this recently. We'll probably need it for apps. 2014-05-07 17:42:58 -07:00
friendica 1ca8584390 Do our best to provide sane cookie defaults. 2014-05-07 16:31:54 -07:00
friendica 92be2e1081 make it easier to plug into .well_known, for instance to tell the EFF to fuck off and not block pages from the free web just because they use cookies. 2014-05-06 22:25:36 -07:00
friendica f1eafbf47d core fixes to allow statusnet connector to work 2014-05-06 19:17:06 -07:00
friendica cc68e06dee setup: check for open https port with an invalid cert, even if configured to use http. Also a bit more word-smithing on the resultant error text but it's still not perfect. 2014-05-06 17:32:22 -07:00
friendica abf0dd5ecf log pickups 2014-05-05 20:15:01 -07:00
friendica 45ce3f4b13 You wouldn't think we need this text, but we really do. 2014-05-05 19:45:30 -07:00
friendica 8584b13e9c added text on concensus building and hints on when to make a feature optional or a plugin. 2014-05-05 19:33:48 -07:00
friendica 1fa8bc12e5 try again 2014-05-05 18:49:58 -07:00
friendica 2949030461 revert 2014-05-05 18:38:11 -07:00
friendica f0653ace22 improved cookie security 2014-05-05 18:35:02 -07:00
friendica bdbda6074c add message_id to reshared items so that we can eventually notify the original poster via an activity that their item was shared. 2014-05-05 16:16:32 -07:00
friendica 94b2ac6abb put permissions dialog inside the form element - should fix issue #444 2014-05-05 16:03:38 -07:00
friendica cea62a0e73 Merge https://github.com/friendica/red into pending_merge 2014-05-05 14:20:30 -07:00
friendica 87aa7446e4 minor text change. 2014-05-05 14:20:09 -07:00
marijus 9df61273db fix some issues with nav-tabs overrides and make their background transparent 2014-05-05 21:58:58 +02:00
jeroenpraat e0b0c58851 Height auto or mini-height 120px. The latter. 2014-05-05 13:59:39 +00:00
jeroenpraat d93df86298 Fixed some wrapping problems when the user has set a larger font size. And some UI love for the file permissions page (as requested by Mike ;) and changed the position of the file properties link on the cloud page. 2014-05-05 13:54:56 +00:00
friendica 806f1f0fa1 UI for deleting chatrooms 2014-05-04 20:30:52 -07:00
friendica 3ae67c517e Merge https://github.com/friendica/red into pending_merge 2014-05-04 17:11:29 -07:00
friendica fc550ae330 issue #432 permission changes lost editing webpage (and other non-post items) 2014-05-04 17:10:33 -07:00
RedMatrix fc5ae78079 Merge pull request #442 from cvogeley/master 
system notifications mark seen link
 2014-05-05 06:43:56 +10:00
RedMatrix 5344e73cda Merge pull request #443 from sasiflo/master 
ifpending repaired again. Hope it works as intended now.
 2014-05-05 06:43:31 +10:00
sasiflo b472cc0fd3 ifpending repaired again. Hope it works as intended now. 2014-05-04 20:42:05 +02:00
Christian Vogeley f7c77c7821 Add link to system notifications page 
to mark notifications seen
 2014-05-04 18:17:11 +02:00
Christian Vogeley b2e0b6f11d system notifications mark seen link 2014-05-04 17:28:43 +02:00
jeroenpraat 98a942bd95 Dark schema: Quick fix for new search dropdown 2014-05-04 14:26:20 +00:00
friendica 3da4656e41 hopefully this will fix it 2014-05-04 03:11:28 -07:00
RedMatrix 6771aaec90 Merge pull request #441 from sasiflo/master 
ifpending repaired. Show page "all contacts" directly if no pending conn...
 2014-05-04 20:08:22 +10:00
sasiflo 3f9513010f ifpending repaired. Show page "all contacts" directly if no pending connections. 
Tried to repair. Think the merge of flags was wrong in the last
commit.
 2014-05-04 11:41:31 +02:00
RedMatrix 5555daaf27 Merge pull request #440 from solstag/master 
Update pt-br translation.
 2014-05-04 11:49:54 +10:00
Alexandre Hannud Abdo 6141b35d03 Update pt-br translation. 2014-05-03 20:13:56 -03:00
jeroenpraat d7b9d1dd59 Share area (jot) the same max-width as the conversation area. Please revert when unwanted 2014-05-03 19:59:12 +00:00
jeroenpraat c338281ca8 Dark schema: I forgot the dropdown menu. 2014-05-03 18:28:47 +00:00
marijus 4975d5f7c1 fix search_item.tpl 2014-05-03 18:42:02 +02:00
friendica 5d623f3a08 more easter eggs 2014-05-03 01:14:28 -07:00
friendica f6bcc1dfc4 Merge https://github.com/friendica/red into pending_merge 2014-05-02 17:30:33 -07:00
friendica 62b4ec4e75 make folks from certain other networks feel more at home here 2014-05-02 17:29:04 -07:00
friendica cdf5e08eb9 weekly update 2014-05-02 17:28:46 -07:00
jeroenpraat f9d2a5f621 Dark schema: last bits. From now on, only updates. 2014-05-02 17:59:02 +00:00
jeroenpraat 3612cdac1a Dark schema: comment border fix 2014-05-02 15:23:40 +00:00
friendica 6eedb2e972 and enable the colourpicker 2014-05-01 22:05:04 -07:00