Commit Graph
22583 Commits
Author SHA1 Message Date
zotlabs 6c641b1834 move oauth2 to vendor 2017-03-14 09:09:05 +11:00
Mario Vavti 700c05a55b many class fixes and revive shiny class for item titles in a new way 2017-03-13 16:34:23 +01:00
Mario Vavti 188782c461 merge dev into bs4 2017-03-13 11:11:20 +01:00
git-marijusandGitHub bdfdd23b36 Merge pull request #697 from anaqreon/dev
Add id to app-menu for JS access
2017-03-13 11:00:19 +01:00
Mario Vavti 9f0c3b496b we need to have this even if we are not the owner. otherwise we loose the acl if e.g. not-owner edits a webpage. should probably find a better solution for this though. 2017-03-13 10:30:41 +01:00
zotlabs fc533107ed better handling of mimetype security 2017-03-12 21:55:24 -07:00
zotlabs 1ee76cb506 remove more hardwired branding 2017-03-12 20:54:48 -07:00
zotlabs 4bb90dffc1 update license 2017-03-12 17:45:51 -07:00
zotlabs f4cd4184f8 update readme 2017-03-12 17:45:18 -07:00
zotlabs c39c925d8d grrr. stop making branding assumptions. 2017-03-12 17:32:45 -07:00
zotlabs b1fc29be11 more cleanup 2017-03-12 16:30:05 -07:00
zotlabs 2a1f6e3df2 update std_version 2017-03-12 15:57:56 -07:00
zotlabs 6f3493bb3c db issues 2017-03-12 15:50:47 -07:00
Mario Vavti 61257094b7 fix help menu 2017-03-12 22:21:49 +01:00
Mario Vavti 8aabc6bc3d many dropdown and class fixes. still a long way to go... 2017-03-12 21:11:28 +01:00
Andrew Manning f68148b7e0 Add id to app-menu for JS access 2017-03-12 13:57:45 -04:00
zotlabs 4c526c7d3d Merge branch 'dev' into red 2017-03-11 18:02:59 -08:00
zotlabs 4a24a8de43 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-11 18:02:38 -08:00
jeroenpraat b8ad22f525 Login-box css-fix for Bluegrid scheme 2017-03-11 21:09:42 +01:00
Mario Vavti d9ecca8591 Merge branch 'dev' into bs4 2017-03-11 15:08:54 +01:00
Mario Vavti 83d07b9551 font size and post title adjust 2017-03-11 15:07:30 +01:00
git-marijusandGitHub ee03391293 Merge pull request #693 from anaqreon/dev
Take me home instead of get me home
2017-03-11 10:58:03 +01:00
zotlabs 30503d6533 strings 2017-03-10 12:45:40 -08:00
zotlabs bbb83bea38 strings 2017-03-10 12:44:57 -08:00
Mario Vavti 0f9ddbf3b2 fixing classes 2017-03-10 17:02:55 +01:00
Mario Vavti b1c97dfcfd some sed magic on button class names 2017-03-10 10:47:30 +01:00
zotlabs 1a49f0d164 one role. 2017-03-09 18:54:10 -08:00
Andrew Manning a2371d56fd Take me home instead of get me home 2017-03-09 20:43:16 -05:00
zotlabs c93db2cd21 more cleanup 2017-03-09 14:31:54 -08:00
zotlabs 15d422db80 Merge branch 'dspr' into red 2017-03-09 14:17:14 -08:00
Mario Vavti 14d1912115 upgrade bs to latest git and some more progress 2017-03-09 22:04:17 +01:00
zotlabs b6477cd38b go back to where the problem started 2017-03-09 11:51:21 -08:00
Mario Vavti c42cbda904 remove navbar-toggler-left class 2017-03-09 10:45:55 +01:00
Mario Vavti 39d56fd08f initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again 2017-03-09 10:17:57 +01:00
zotlabs 403f4c1a6b Monday is a proper name and should be capitalised (except in private conversation amongst unix geeks). 2017-03-08 19:23:11 -08:00
zotlabs 15ab331b6b move all the diaspora content hacks to the diaspora plugin 2017-03-08 17:35:19 -08:00
zotlabs 9ca53fdc5d DCV stuff 2017-03-07 17:44:19 -08:00
Mario Vavti 8e3a026276 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-03-07 12:08:43 +01:00
jeroenpraatandMario Vavti b5ddd08630 Big 2.2 string update Dutch 2017-03-07 12:08:16 +01:00
zotlabs a037590ce3 allow post_activity_item to be passed an empty ACL without resetting to channel default 2017-03-06 21:01:17 -08:00
zotlabs a18e8e1ede add public_policy to the nwiki container also. This should not affect the recent bug as presented, but is being added for consistency. 2017-03-06 17:59:34 -08:00
zotlabs 595cb13d8f correct fix for wiki anonymous read issue (items_permissions_sql checks item.public_policy which was set for posts, not wikis) 2017-03-06 15:33:10 -08:00
Mario Vavti 9e44b07275 allow unauthenticated access to public wiki pages 2017-03-06 22:32:05 +01:00
Mario Vavti 99e681c09f do not collapse long nsfw content 2017-03-06 11:52:07 +01:00
zotlabs 4f5e9d77b2 remove include/probe.php which has never completed development and has never been used 2017-03-05 20:45:21 -08:00
zotlabs 98ccdf65fb Merge branch 'dev' into red 2017-03-05 16:32:53 -08:00
zotlabs 4c0c153b8f move emoji emoticons (not reactions) to plugin 2017-03-05 16:18:09 -08:00
zotlabs c533c62c64 some event work 2017-03-05 14:47:20 -08:00
zotlabs 384db9d10d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-03-05 11:02:19 -08:00
zotlabsandGitHub 5d8b0acc16 Merge pull request #689 from mjfriaza/dev
Translated the last strings into Spanish version
2017-03-05 19:25:41 +11:00