Commit graph

10214 commits

Author SHA1 Message Date
Thomas Willingham
891a7fb0f5 Merge pull request #417 from f03el/master
Update Swedish translation
2014-04-19 15:45:42 +01:00
Thomas Willingham
33ff5b3a9b Clean up legacy smarty3 2014-04-19 13:59:12 +01:00
jeroenpraat
9da7da1cbd Oeps 2014-04-19 12:11:58 +00:00
Erik Lundin
6a3c9e752a Merge branch 'master' of https://github.com/f03el/red 2014-04-19 14:04:49 +02:00
Erik Lundin
b8547039a8 Update Swedish strings 2014-04-19 14:04:03 +02:00
Erik Lundin
72b913ad1b Update Swedish strings 2014-04-19 13:59:49 +02:00
Christian Vogeley
4c950dc38a More work 2014-04-19 04:13:15 +02:00
Christian Vogeley
ea5d3e1774 For the moment restore old delete icon
because the integrated button in the the bootstrap menu didn’t work on
Firefox
2014-04-19 03:49:17 +02:00
jeroenpraat
2a336dbf7f Workaround alignment notify menu's 2014-04-19 01:33:30 +00:00
Christian Vogeley
b9ffc2ef44 Move javascript calls to button tag
because otherwise it didn’t work in Firefox
2014-04-19 03:16:26 +02:00
Christian Vogeley
8f1dde701a Bootstrapify item tools
Only show the like buttons and the delete button permanently hide
everything else in a drop down. This will break non bootstrap themes.
So may be we also want to move this into the red basic folder. It still
a little bit work in progress. Allignment is not 100% correct. May be
we want to add text into the drop down.
2014-04-19 02:45:44 +02:00
friendica
9e865d1e47 remove whitespace at the top of widgets because bootstrap gives us 20 pixels above an h3 element and we end up with way too much whitespace 2014-04-18 17:39:13 -07:00
friendica
b886647429 Merge https://github.com/friendica/red into pending_merge 2014-04-18 16:14:13 -07:00
friendica
ae1f9bf1c4 move create a new collection below the actual collection list again. failed experiment. 2014-04-18 15:31:15 -07:00
Erik Lundin
b7992a5544 Update Swedish email templates 2014-04-19 00:05:13 +02:00
Thomas Willingham
fdcb6052fc Merge branch 'master' of https://github.com/friendica/red 2014-04-18 16:35:31 +01:00
Thomas Willingham
4e0b85267a We know why third party zids didn't work now, so don't use hacky
workarounds anymore.
2014-04-18 16:34:48 +01:00
jeroenpraat
2ac7fb49b6 This should fix the preview allignment permantly. 2014-04-18 15:08:16 +00:00
jeroenpraat
59eb3b3351 Little fix and previous fix on a different place 2014-04-18 12:57:42 +00:00
friendica
d2b5bb843f more optimisations for discovery mode of zotfeed 2014-04-17 22:06:35 -07:00
friendica
ac07b1b0ae Merge https://github.com/friendica/red into pending_merge 2014-04-17 20:07:02 -07:00
friendica
30e2e32f19 improve zotfeed for discover channel so it will send updates to posts you've already received. Incidentally I discovered why we had the meltdown replying to discover channel items the other day - but can't fix it easily. 2014-04-17 20:03:28 -07:00
Erik Lundin
e2379f2359 Add Swedish .po file and update strings 2014-04-18 00:17:38 +02:00
jeroenpraat
c463eb932c tiny fix hover preview button 2014-04-17 20:46:14 +00:00
jeroenpraat
ca5f7ef446 Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now). 2014-04-17 15:18:53 +00:00
friendica
083cf12d48 Merge https://github.com/friendica/red into pending_merge 2014-04-17 01:36:17 -07:00
friendica
8dcf9e78e1 This preserves the alignment work done earlier but provides a more aesthetically pleasing page. 2014-04-17 01:33:44 -07:00
jeroenpraat
0d0751b925 Merge branch 'master' of https://github.com/friendica/red 2014-04-17 05:46:45 +00:00
friendica
962665b8b5 saved search adjustments 2014-04-16 21:46:06 -07:00
friendica
be498be840 a few more alignment issues 2014-04-16 21:08:43 -07:00
friendica
f191637ffa clean up the group selector on the connedit page 2014-04-16 20:33:15 -07:00
friendica
9be4cd4dcd Lots of positional changes on sidebar menus - reduce indented margins
Merge branch 'master' into ruler

Conflicts:
	view/css/widgets.css
2014-04-16 20:28:23 -07:00
friendica
acc70b9deb fixing widgets 2014-04-16 20:09:19 -07:00
friendica
d26a433a5e Merge https://github.com/friendica/red into pending_merge 2014-04-16 18:36:26 -07:00
friendica
c7712d3b45 bug fixes after widget cleanup 2014-04-16 18:35:37 -07:00
friendica
558e283260 button cleanup directory page 2014-04-16 18:28:36 -07:00
friendica
433d964dd5 this makes conversations look a lot better 2014-04-16 18:07:33 -07:00
Thomas Willingham
3a96691e29 Doc - missing closing tag 2014-04-17 01:19:58 +01:00
Thomas Willingham
3f98d57fdd Merge pull request #415 from encyclomundi/master
added "network" as another user group for davfs
2014-04-17 01:17:49 +01:00
Charles
51d7be6f24 added "network" as another user group for davfs 2014-04-16 17:12:49 -07:00
friendica
2d86c7317c rev update 2014-04-16 16:42:27 -07:00
friendica
1b0bf90d13 first cut - straighten out the margins 2014-04-16 16:41:44 -07:00
jeroenpraat
68545ceeb6 Dark schema: fixed code view, ACL window and preview 2014-04-16 21:51:13 +00:00
Thomas Willingham
9589d12c93 Doco - Add some troubleshooting for 0 byte files in Davfs2 2014-04-16 18:50:48 +01:00
RedMatrix
077296ccf1 Merge pull request #414 from jeroenpraat/patch-2
Large update dark schema
2014-04-16 17:39:51 +10:00
friendica
925c63343e The comment submit button seems to have drifted into some strange place 2014-04-15 21:36:51 -07:00
friendica
e0cccb4cc2 Merge https://github.com/friendica/red into pending_merge 2014-04-15 18:36:05 -07:00
friendica
1eb8e570bf tag anyone 2014-04-15 18:35:22 -07:00
sirius
b0dc9f13ed Merging in conflict 2014-04-16 00:40:01 +02:00
jeroenpraat
16db393495 Needed for large update dark schema and minor fixes default. 2014-04-15 21:35:30 +02:00