aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-154-766/+764
|\
| * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-03-145-1095/+908
| |\
| * | update nl + es-es stringsjeroenpraat2016-03-144-766/+764
* | | some heavy lifting porting the old salmon coderedmatrix2016-03-151-0/+9
| |/ |/|
* | Merge pull request #323 from phellmes/de20160313redmatrix2016-03-142-859/+883
|\ \
| * | Update DE translation stringsphellmes2016-03-132-859/+883
* | | fix spacingMario Vavti2016-03-131-1/+6
* | | more janitor work on profilesMario Vavti2016-03-132-191/+14
|/ /
* / some janitor work on profilesMario Vavti2016-03-122-45/+6
|/
* issue #319 - make sure we have a local_channel() and an App::channel before t...redmatrix2016-03-091-1/+1
* move "generator" to HttpMetaredmatrix2016-03-081-1/+0
* Merge pull request #314 from wave72/masterWave2016-03-082-1810/+1819
|\
| * Updated Italian stringsPaolo Tacconi2016-03-082-1810/+1819
* | removed id by mistake - add it againMario Vavti2016-03-081-1/+1
* | add generic-content-wrapper and setction-content-wrapper to profile_edit.tplMario Vavti2016-03-082-2/+4
* | a bit of page cleanup for edit profilesredmatrix2016-03-072-69/+77
* | Small, but important fix for Dutchjeroenpraat2016-03-082-2/+2
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-079-1059/+1120
|\ \
| * \ Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-0713-8039/+8334
| |\ \
| | * | Spanish and Dutch strings + fix es>es-es linkjeroenpraat2016-03-075-1057/+1110
| | * | Merge pull request #312 from jeroenpraat/masterredmatrix2016-03-083-0/+8
| | |\ \
| | | * | Show only schema selector when Redbasic (so not a derived theme)Jeroen van Riet Paap2016-03-071-0/+2
| | | * | Set the schema to the default schema in derived themes.Jeroen van Riet Paap2016-03-071-0/+5
| | | * | Update config.phpJeroen van Riet Paap2016-03-071-0/+1
| * | | | prevent page jumping if the narrow navbar setting is usedMario Vavti2016-03-071-2/+2
| | |/ / | |/| |
* | | | Facebook scraper "OpenGraph" support; modules will need to set the required f...redmatrix2016-03-077-7/+7
| |/ / |/| |
* | | Merge pull request #308 from HaakonME/masterJeroen van Riet Paap2016-03-072-6981/+7203
|\ \ \
| * | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-03-062-1/+2
| |\| |
| * | | Updated Norwegian strings for HubzillaHaakon Meland Eriksen2016-03-052-6981/+7203
* | | | Merge pull request #310 from einervonvielen/updated_homeinstall_instructionsJeroen van Riet Paap2016-03-071-1/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/redmatrix/hubzillaroot2016-03-061-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://git...root2016-03-061-1/+0
| |\ \ \ \
| | * | | | .Einer von Vielen2016-01-131-1/+0
* | | | | | Added Link to TOS to EMail templates targeting membersTobias Luther2016-03-063-0/+13
| |_|/ / / |/| | | |
* | | | | Also make it clear with (mouse) hover text that you must click on the cover p...jeroenpraat2016-03-061-1/+1
|/ / / /
* | / / Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it...jeroenpraat2016-03-061-0/+1
| |/ / |/| |
* | | show cover-photo upload link only for the default profileMario Vavti2016-03-041-1/+1
* | | add cover photo upload link to edit profileMario Vavti2016-03-041-0/+1
* | | fix jot formMario Vavti2016-03-031-11/+11
* | | slide up cover on clickMario Vavti2016-03-031-1/+5
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-032-10/+17
|\ \ \
| * | | UI cleanup for admin profile field management pageredmatrix2016-03-021-9/+16
| * | | little nl string fixJeroen van Riet Paap2016-03-021-1/+1
* | | | move cover-photo to template, add the ability to define a title and subtitle ...Mario Vavti2016-03-033-24/+76
|/ / /
* | | small fix to simple cover-photoMario Vavti2016-03-022-6/+4
* | | add a fade in effect to main while scrolling up cover photoMario Vavti2016-03-021-0/+5
* | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-03-023-10/+97
|\ \ \
| * | | sort out the with and howlong dependenciesredmatrix2016-03-011-1/+1
| * | | profile field admin page (functional only: still needs a lot of HTML/CSS clea...redmatrix2016-03-012-0/+32
| * | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-03-0110-50/+55
| |\ \ \