Commit Graph

3565 Commits

Author SHA1 Message Date
friendica
18f5890cb1 make profile edit pencil stand out a bit on darker backgrounds 2014-07-24 22:29:03 -07:00
friendica
5dcd0654d4 always provide a profile edit entry in the nav usermenu 2014-07-24 21:29:07 -07:00
friendica
1a6973a670 cherry pick pull request #544 2014-07-24 19:07:04 -07:00
mycocham
936f596af4 French Translations 2014-07-24 19:23:03 -04:00
marijus
9001406346 update to bootstrap-3.2 and minor css adjustments 2014-07-24 13:51:06 +02:00
friendica
ee75efd951 Merge branch 'master' of https://github.com/mrjive/red into mrjive-master
Conflicts:
	view/it/messages.po
2014-07-23 16:46:02 -07:00
mrjive
aa6d61d3b1 Just a small typo
Fixed a small typo (and also to try if I'm doing right)
2014-07-24 00:29:36 +02:00
Jeroen
02a4dac39b Merge branch 'master' of https://github.com/friendica/red 2014-07-23 13:03:12 +00:00
Jeroen
06470cd114 update nl 2014-07-23 13:02:14 +00:00
friendica
5c6a251213 some backend JS support for an endless scroll directory 2014-07-22 22:15:34 -07:00
friendica
8dc3446be4 when telling somebody that permissions have changed but not yet submitted, give them a submit button *right there* so they don't have to look for it. 2014-07-22 20:20:01 -07:00
tuscanhobbit
7b8edeaead IT: updated strings 2014-07-19 11:47:48 +02:00
friendica
b19176169c provide a specific permission for liking profiles (reuse the obsolete bookmark permission), also remove the unused 'unconnected contacts' view for now. 2014-07-17 20:54:30 -07:00
friendica
bfe4bdc30b make mod_like interactive if requested 2014-07-17 18:20:12 -07:00
Jeroen
010d4071ad Introducing page template Redable (sic). A template for making it easier to read long texts on a wide range of devices. Using rem and em for font sizes and region widths. Regions: aside, content, right_aside and footer. Advised to only use the middle content region as much as possible (but left and right can be used for indexes if you like). Based on the default template. Maybe later I will add some alternative css's. 2014-07-16 18:09:46 +00:00
jeroenpraat
07070b0a20 small fix nl 2014-07-09 19:04:21 +00:00
friendica
7c40a41e1b more event display formatting 2014-07-07 01:42:46 -07:00
friendica
0764b78da3 event render improvements 2014-07-06 23:13:17 -07:00
jeroenpraat
dcf4bf595c nl 100%git status 2014-07-06 18:32:03 +00:00
friendica
5ed9444bee some initial work towards email address verification 2014-07-03 18:29:32 -07:00
jeroenpraat
0f5cd7d7fa fix nl 2014-07-03 22:36:58 +00:00
friendica
c7086b77fd move code out of templates - not sure how this even worked. 2014-07-03 00:58:49 -07:00
jeroenpraat
1cbec39af8 Red Matrix default instead of global default. Is more clear. Update nl to 99%. Update util/messages.po 2014-07-02 13:26:44 +00:00
jeroenpraat
06935e96eb Merge branch 'master' of https://github.com/friendica/red 2014-07-02 13:20:08 +00:00
jeroenpraat
42c9a67dee Changed Default to Light (global default). So if hub owners want to change the default, they don't get two defaults. Please revert when not needed/wanted. 2014-07-02 13:13:29 +00:00
Paolo T
647ca2ee43 Merge pull request #525 from tuscanhobbit/master
IT: strings updated
2014-07-02 11:47:58 +02:00
Paolo Tacconi
fea5bfe388 IT: strings updated 2014-07-02 11:46:23 +02:00
friendica
7a082394c3 minor adjustments 2014-07-01 22:02:36 -07:00
jeroenpraat
c5123b59cc fix 1 error in nl that somehow sneaked in 2014-07-01 23:09:18 +00:00
jeroenpraat
9c40071509 update/approve nl to 98%git status 2014-07-01 22:59:03 +00:00
jeroenpraat
502b30e768 update nl 2014-07-01 15:46:05 +00:00
RedMatrix
406740479a Merge pull request #520 from pixelroot/master
Updated Russian translation
2014-07-01 09:19:24 +10:00
RedMatrix
bb4ece672a Merge pull request #521 from tuscanhobbit/master
Changed the lock icon behaviour
2014-07-01 09:19:08 +10:00
jeroenpraat
2f56472f0c update nl 2014-06-30 20:30:06 +00:00
Paolo Tacconi
78c25cf2f0 Changed the lock icon behaviour 2014-06-30 17:10:42 +02:00
pixelroot
cadcd45e89 Updated Russian translation 2014-06-30 14:18:02 +02:00
jeroenpraat
52adbb6504 update nl 2014-06-29 23:26:04 +00:00
RedMatrix
0926c2d849 Merge pull request #516 from dawnbreak/master
Fixed a wrong timestamp update when adding a file.
2014-06-30 09:19:52 +10:00
Christian Vogeley
eb41b0ba7c Remove Remove Account link from account settings
because it doesn’t remove the account. Move channel removal link to
channel page
2014-06-29 22:19:45 +02:00
Klaus Weidenbach
322091cd12 Fixed some more timestamp bugs in RedDAV.
Fixed an SQL-query in RedFile::put(), where parameters where in wrong order.
2014-06-29 17:49:46 +02:00
Paolo T
628f121804 Merge pull request #515 from tuscanhobbit/master
IT:updated strings
2014-06-29 12:43:24 +02:00
tuscanhobbit
98324cb277 IT:updated strings 2014-06-29 12:41:19 +02:00
RedMatrix
e228c2ed32 Merge pull request #513 from dawnbreak/master
Some documentation for include/reddav.php and a new tpl-file.
2014-06-29 10:16:51 +10:00
RedMatrix
f29f8a1b40 Merge pull request #514 from tuscanhobbit/master
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
2014-06-29 10:15:55 +10:00
Klaus Weidenbach
f49b74c5f6 Some documentation for include/reddav.php and a new tpl-file.
Documented include/reddav.php a bit more to understand what it is
about to try to clean up some parts. Still a lot to be done here.
I put serveral @todo markers that need to be checked.

Moved some more HTML to template file.

Changed getETag() return format according to documentation. (ETag MUST
be surrounded by double-quotes)
2014-06-29 01:17:06 +02:00
tuscanhobbit
dfe45342f6 Checkboxes were not aligned in connedit, added a table 2014-06-28 23:14:34 +02:00
friendica
253f2cde9f Merge https://github.com/friendica/red into pending_merge 2014-06-26 17:19:15 -07:00
friendica
6d05d502e3 still trying to sort out the liveupdate issues. This was getting overly complicated with all the different ways we've tried to fix this issue so let's step back and simplify it a bit. 2014-06-26 17:17:24 -07:00
jeroenpraat
aeab6431d2 update nl 2014-06-27 00:13:22 +00:00
marijus
c6cae8e0c2 make it a div to prevent extra borders in some browsers after click 2014-06-26 19:08:16 +02:00