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

5055 Commits

Author SHA1 Message Date
Mario Vavti 40162cd6b7 some work on profile listing 2016-03-17 12:56:55 +01:00
Mario Vavti a41a05e6c0 bring more structure to profiles edit 2016-03-17 11:50:53 +01:00
Mario Vavti 2165733ddc move buttons to dropdown menu and some cleanup 2016-03-16 23:07:29 +01:00
Mario Vavti d22b21c56f still more janitor work on profiles 2016-03-16 13:45:24 +01:00
Mario Vavti d98d7003ed even more janitor work on profiles 2016-03-15 21:38:03 +01:00
redmatrix 01a28ddf8d Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-15 01:32:41 -07:00
redmatrix e8d19659c0 some heavy lifting porting the old salmon code 2016-03-15 00:50:03 -07:00
jeroenpraat b8e8517725 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-14 15:46:57 +01:00
jeroenpraat def0454952 update nl + es-es strings 2016-03-14 15:43:51 +01:00
redmatrix fbfa391965 Merge pull request #323 from phellmes/de20160313 
Update DE translation strings
 2016-03-14 10:45:54 +11:00
Mario Vavti 38beabb508 fix spacing 2016-03-13 21:27:29 +01:00
Mario Vavti 370a007ee2 more janitor work on profiles 2016-03-13 21:19:15 +01:00
phellmes a752d44313 Update DE translation strings 2016-03-13 13:29:14 +01:00
Mario Vavti 2d8deb6082 some janitor work on profiles 2016-03-12 22:13:46 +01:00
redmatrix 7bb461380e issue #319 - make sure we have a local_channel() and an App::channel before trying to change the default schema for a channel 2016-03-09 14:15:50 -08:00
redmatrix cf4dc2caa8 move "generator" to HttpMeta 2016-03-08 16:21:35 -08:00
Wave 8f4fe106ef Merge pull request #314 from wave72/master 
Updated Italian strings
 2016-03-08 15:54:54 +01:00
Paolo Tacconi d74274c7e4 Updated Italian strings 2016-03-08 15:51:21 +01:00
Mario Vavti d59268a5d8 removed id by mistake - add it again 2016-03-08 11:47:17 +01:00
Mario Vavti f364343b55 add generic-content-wrapper and setction-content-wrapper to profile_edit.tpl 2016-03-08 11:43:21 +01:00
redmatrix 32e903e956 a bit of page cleanup for edit profiles 2016-03-07 18:49:17 -08:00
jeroenpraat 24fa201218 Small, but important fix for Dutch 2016-03-08 01:47:01 +01:00
redmatrix 1a77fb4c1d Merge https://github.com/redmatrix/hubzilla into pending_merge 2016-03-07 15:12:09 -08:00
redmatrix d5db25808a Facebook scraper "OpenGraph" support; modules will need to set the required fields (type, image, url) as well as any desired optional or type specific fields. We will set the title during pagebuild. 2016-03-07 15:03:53 -08:00
Mario Vavti 6824fb9f93 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-07 21:48:12 +01:00
Mario Vavti b2216f8203 prevent page jumping if the narrow navbar setting is used 2016-03-07 21:47:52 +01:00
jeroenpraat 0799a0a3be Spanish and Dutch strings + fix es>es-es link 2016-03-07 20:29:14 +01:00
redmatrix a2e0574fce Merge pull request #312 from jeroenpraat/master 
Redbasic: Fix the issue with derived themes and schemas
 2016-03-08 06:03:55 +11:00
Jeroen van Riet Paap 68d7ab6b55 Merge pull request #308 from HaakonME/master 
Updated Norwegian strings for Hubzilla.

@HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96
 2016-03-07 19:53:58 +01:00
Jeroen van Riet Paap 4a2c805270 Merge pull request #310 from einervonvielen/updated_homeinstall_instructions 
Updated readme.md for homeinstall script
 2016-03-07 19:49:58 +01:00
Jeroen van Riet Paap 95f5f3d44d Show only schema selector when Redbasic (so not a derived theme) 2016-03-07 17:06:10 +01:00
Jeroen van Riet Paap 7a5213cc8e Set the schema to the default schema in derived themes. 
See the documentation for creating derived themes how to override this.
 2016-03-07 17:03:02 +01:00
Jeroen van Riet Paap f1f19372ad Update config.php 2016-03-07 17:01:12 +01:00
Tobias Luther 1c6faa3a00 Added Link to TOS to EMail templates targeting members 2016-03-06 18:45:43 +01:00
Haakon Meland Eriksen a1e4940bea Merge remote-tracking branch 'upstream/master' 2016-03-06 18:33:28 +01:00
root 287ffe93f6 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-06 17:24:15 +01:00
root 2407379623 Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://github.com/einervonvielen/hubzilla 2016-03-06 17:19:33 +01:00
jeroenpraat 7162403292 Also make it clear with (mouse) hover text that you must click on the cover photo to show the channel/more 2016-03-06 17:02:58 +01:00
jeroenpraat 004468f231 Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it's not clear that you can click on it to show something (the channel in this case). 2016-03-06 16:21:26 +01:00
Haakon Meland Eriksen 2d7e307e74 Updated Norwegian strings for Hubzilla 2016-03-05 14:11:56 +01:00
Mario Vavti 25ebac8d0b show cover-photo upload link only for the default profile 2016-03-04 16:07:41 +01:00
Mario Vavti edf6da7189 add cover photo upload link to edit profile 2016-03-04 15:44:33 +01:00
Mario Vavti d3491c9165 fix jot form 2016-03-03 13:46:08 +01:00
Mario Vavti 8ca877bdd3 slide up cover on click 2016-03-03 12:31:49 +01:00
Mario Vavti b704f977da Merge branch 'master' of https://github.com/redmatrix/hubzilla 2016-03-03 12:08:21 +01:00
Mario Vavti 59e04aed1b move cover-photo to template, add the ability to define a title and subtitle (defaults to channel name and addres), move js from redbasic.js to template. 2016-03-03 12:07:58 +01:00
redmatrix 6f4c45a489 UI cleanup for admin profile field management page 2016-03-02 15:36:14 -08:00
Jeroen van Riet Paap aa62bad07b little nl string fix 2016-03-02 15:33:18 +01:00
Mario Vavti d3f2d2a2db small fix to simple cover-photo 2016-03-02 14:30:33 +01:00
Mario Vavti c5d08fd5fd add a fade in effect to main while scrolling up cover photo 2016-03-02 13:33:18 +01:00