aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #416 from cvogeley/masterRedMatrix2014-04-202-9/+67
|\
| * cssChristian Vogeley2014-04-201-3/+6
| * ok we need that divChristian Vogeley2014-04-201-1/+1
| * Add descriptions to drop downChristian Vogeley2014-04-201-7/+7
| * More workChristian Vogeley2014-04-191-19/+14
| * For the moment restore old delete iconChristian Vogeley2014-04-191-3/+3
| * Move javascript calls to button tagChristian Vogeley2014-04-191-5/+5
| * Bootstrapify item toolsChristian Vogeley2014-04-192-15/+75
* | Merge pull request #417 from f03el/masterThomas Willingham2014-04-1916-1555/+9479
|\ \
| * \ Merge branch 'master' of https://github.com/f03el/redErik Lundin2014-04-190-0/+0
| |\ \
| | * | Update Swedish stringsErik Lundin2014-04-191-942/+943
| * | | Update Swedish stringsErik Lundin2014-04-192-1152/+1153
| |/ /
| * | Update Swedish email templatesErik Lundin2014-04-1914-234/+95
| * | Add Swedish .po file and update stringsErik Lundin2014-04-182-1321/+9383
* | | Clean up legacy smarty3Thomas Willingham2014-04-19127-3224/+0
* | | Oepsjeroenpraat2014-04-191-1/+0
* | | Workaround alignment notify menu'sjeroenpraat2014-04-193-1/+11
* | | remove whitespace at the top of widgets because bootstrap gives us 20 pixels ...friendica2014-04-181-8/+1
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-184-9/+10
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-04-182-2/+5
| |\ \ \
| | * | | This should fix the preview allignment permantly.jeroenpraat2014-04-182-2/+5
| | | |/ | | |/|
| * / | We know why third party zids didn't work now, so don't use hackyThomas Willingham2014-04-182-5/+2
| |/ /
| * | Little fix and previous fix on a different placejeroenpraat2014-04-181-3/+4
* | | move create a new collection below the actual collection list again. failed e...friendica2014-04-1812-888/+898
|/ /
* | more optimisations for discovery mode of zotfeedfriendica2014-04-171-2/+6
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-173-3/+32
|\ \
| * | tiny fix hover preview buttonjeroenpraat2014-04-171-0/+4
| |/
| * Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now).jeroenpraat2014-04-173-3/+28
* | improve zotfeed for discover channel so it will send updates to posts you've ...friendica2014-04-173-17/+16
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-174-9/+58
|\
| * Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-04-1714-78/+114
| |\
| * | Dark schema: fixed code view, ACL window and previewjeroenpraat2014-04-164-9/+58
* | | This preserves the alignment work done earlier but provides a more aesthetica...friendica2014-04-174-2/+18
| |/ |/|
* | saved search adjustmentsfriendica2014-04-162-13/+9
* | a few more alignment issuesfriendica2014-04-163-13/+16
* | clean up the group selector on the connedit pagefriendica2014-04-161-1/+4
* | Lots of positional changes on sidebar menus - reduce indented marginsfriendica2014-04-1610-59/+351
|\ \
| * \ Merge https://github.com/friendica/red into pending_mergefriendica2014-04-164-39/+313
| |\ \
| | * | Doc - missing closing tagThomas Willingham2014-04-171-1/+1
| | * | Merge pull request #415 from encyclomundi/masterThomas Willingham2014-04-171-0/+4
| | |\ \ | | | |/ | | |/|
| | | * added "network" as another user group for davfsCharles2014-04-161-0/+4
| | |/
| | * Doco - Add some troubleshooting for 0 byte files in Davfs2Thomas Willingham2014-04-161-1/+20
| | * Merge pull request #414 from jeroenpraat/patch-2RedMatrix2014-04-163-38/+289
| | |\
| | | * Needed for large update dark schema and minor fixes default.jeroenpraat2014-04-151-18/+98
| | | * Needed for large update dark schema.jeroenpraat2014-04-151-4/+107
| | | * Large update dark schemajeroenpraat2014-04-151-16/+84
| * | | bug fixes after widget cleanupfriendica2014-04-162-3/+3
| * | | button cleanup directory pagefriendica2014-04-163-14/+18
| * | | rev updatefriendica2014-04-161-1/+1
| |/ /
* | | fixing widgetsfriendica2014-04-165-34/+32