Zach Prezkuta
0e67ba2bd4
update minified javascripts
2013-02-04 18:16:13 -07:00
Zach Prezkuta
1033e8896f
finish updating themes for colorbox
2013-02-04 18:09:56 -07:00
Zach Prezkuta
0f25455d1b
starting switching to colorbox
2013-02-04 18:09:56 -07:00
9dbe7efce5
ZH-CN: update to the strings
2013-02-03 15:14:57 +01:00
zottel
7db626b1b5
also reset network in mobile themes, smarty3 updates
2013-02-01 20:37:16 +01:00
zottel
e2949ab913
Merge remote branch 'upstream/master'
2013-02-01 20:31:55 +01:00
bfe7b5e1c3
ZH-CN: update to the strings
2013-02-01 10:49:32 +01:00
zottel
c0af9b2938
Reset network when showing a contact's posts
...
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
2013-02-01 09:12:37 +01:00
Zach Prezkuta
7d3a923294
script for minifying javascript files
2013-01-31 19:05:27 -07:00
303e5e1b10
ZH-CN: update to the strings
2013-01-31 06:42:10 +01:00
Thomas Willingham
d0d9ae3096
Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme.
2013-01-30 02:51:47 +00:00
50a64a47fc
ZH-CN: update to the strings
2013-01-28 15:23:09 +01:00
612af04b1c
DE: update to the strings
2013-01-28 15:21:57 +01:00
5c3bce30d6
Merge branch 'master' of git://github.com/friendica/friendica
2013-01-28 07:00:07 +01:00
28e4b8512a
ZH-CN: update to the strings
2013-01-28 06:57:44 +01:00
friendica
a5ac69c65e
Merge pull request #591 from fermionic/20130126-javascript-free-theme
...
Decaf mobile: an (almost) Javascript-free theme
2013-01-27 19:11:36 -08:00
Zach Prezkuta
6668d22d37
try to improve TinyMCE block handling
2013-01-27 14:41:48 -07:00
Zach Prezkuta
a15fff2fc6
mark experimental
2013-01-26 13:10:10 -07:00
Zach Prezkuta
acc4d66cd3
update smart templates
2013-01-26 13:07:54 -07:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
friendica
37a5ff848d
Merge https://github.com/friendica/friendica into pull
2013-01-25 13:50:27 -08:00
friendica
04b48688b6
add form security to invite page and set maximum per user invites
2013-01-25 13:48:57 -08:00
ec58e106c2
ZH-CN: update to the strings
2013-01-24 07:38:13 +01:00
cb4edf3928
IT: update to the strings
2013-01-24 07:37:16 +01:00
fabrixxm
9b394dbe1e
Merge pull request #589 from fabrixxm/master
...
Update fancybox, remove tiptip
2013-01-23 01:19:05 -08:00
Fabrixxm
a875bec75c
update fancybox, remove tiptip from head.tpl
2013-01-22 08:17:23 -05:00
03ec6cabda
PL: update to the strings
2013-01-22 08:01:25 +01:00
da12177aea
PL: update to the strings
2013-01-21 08:05:57 +01:00
Michael - piratica.eu
cc9ce39e3f
Merge branch 'master' of https://github.com/annando/friendica
...
Conflicts:
include/poller.php
2013-01-20 14:17:09 +01:00
Michael - piratica.eu
7ab335c9d6
Diaspora: Auto-adding users as friend who already sharing with us
2013-01-20 14:08:28 +01:00
Michael Vogel
4e3d0018c6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/items.php
update.php
2013-01-20 14:07:57 +01:00
95f58426d8
DE: update to the strings
2013-01-19 15:36:09 +01:00
406692c7c6
DE: update to the strings
2013-01-18 12:40:44 +01:00
01875fff5b
PL: update to the strings
2013-01-18 12:40:24 +01:00
605f94f790
ZH-CN: update to the strings
2013-01-18 12:39:55 +01:00
friendica
30f1fb2c4d
provide a date indication in reshared content
2013-01-15 14:58:50 -08:00
Zach Prezkuta
28c9123ac8
module to show system down message
2013-01-14 16:48:01 -07:00
e8952541af
ZH-CN: update to the strings
2013-01-13 12:55:13 +01:00
friendica
8b643d4c88
Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
...
fixes and tweaks to Smarty processing
2013-01-12 12:28:14 -08:00
Zach Prezkuta
74caf1a4a7
* Add MIME types for file attachments
...
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
2013-01-12 06:31:32 -07:00
Zach Prezkuta
609c45e791
fixes and tweaks to Smarty processing
2013-01-12 05:58:54 -07:00
Zach Prezkuta
c43ff35fe7
newline at end of header
2013-01-11 10:00:10 -07:00
Zach Prezkuta
1656c63a55
add warning message about automatically generated templates
2013-01-11 09:57:11 -07:00
Zach Prezkuta
f24d460522
automatic, command-line conversion
2013-01-11 09:41:45 -07:00
Oliver
a543a1a0c2
typo correction
...
we don't want to drop Hilde
2013-01-11 14:15:17 +01:00
pixelroot
637cfdd7cb
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2013-01-11 10:56:14 +01:00
Zach Prezkuta
1cfc660e6d
update a few more Smarty templates
2013-01-10 22:36:44 -07:00
Zach Prezkuta
cd017282e4
use Python 2.4 compatible script; update Smarty templates
2013-01-10 22:34:23 -07:00
Michael Vogel
61c78711df
Preparations for a new tag structure. Tags are now stored in a dedicated table.
2013-01-11 01:20:16 +01:00
df9f3b3db3
ZH-CN: update to the strings
2013-01-10 06:49:35 +01:00
5ad382d797
DE: update to the strings
2013-01-10 06:48:54 +01:00
Michael Vogel
82820d8e95
Now the third most likely languages are shown.
...
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
2013-01-09 20:54:18 +01:00
friendica
f6a63abd7d
update smarty diabook templates bug 525
2013-01-08 14:45:19 -08:00
e09c31b627
CS: update to the strings
2013-01-05 09:29:26 +01:00
friendica
88cc414355
Merge pull request #570 from annando/master
...
Vier, caches and "share" via API
2013-01-04 15:13:09 -08:00
friendica
c0fd572fec
Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init
...
Finalize theme decision in a module's _init function
2013-01-04 14:36:47 -08:00
602ca63111
PL: update to the strings
2013-01-04 09:18:21 +01:00
Zach Prezkuta
fdd142c42e
never use profile_load outside of a module's _init() function
2013-01-03 10:47:45 -07:00
Olaf Conradi
1c81409bf8
Merge pull request #573 from oohlaf/fixes
...
Don't add src attributes inside acl-template
2013-01-02 05:32:19 -08:00
Olaf Conradi
2943550fe2
No need to remove data-src attributes
...
Better comment string also
2013-01-02 14:28:13 +01:00
68d304cc0f
Merge branch 'master' of git://github.com/friendica/friendica
2013-01-02 11:10:59 +01:00
e56c041579
DE: update to the strings
2013-01-02 11:10:24 +01:00
fermionic
3c49a1b769
Merge pull request #572 from cvogeley/master
...
Fix registration form
2013-01-01 15:12:45 -08:00
Christian Vogeley
457a3b5220
Change templates remove var modifiers
2013-01-01 23:41:26 +01:00
Christian Vogeley
5bfd4cf5c4
Move HTML part of oid to template + replace outside the tpl
2013-01-01 22:40:05 +01:00
0472ab7282
DE: update to the strings
2013-01-01 22:25:55 +01:00
Christian Vogeley
cde9b6370d
Fix registration form
2013-01-01 21:05:24 +01:00
pixelroot
966d786982
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2013-01-01 16:42:52 +01:00
Zach Prezkuta
1d1c8f4771
replace dashes with underscores in diabook
2012-12-30 20:46:03 -07:00
Olaf Conradi
6a2bd8b29f
Don't replace data-src with src in acl-template
...
On pageload an empty acl-list-item as template is created and not yet replaced.
Don't change the data-src for src attributes in those images.
2012-12-31 00:01:15 +01:00
Michael Vogel
348f43157a
Vier: Some templates were missing
2012-12-30 22:58:05 +01:00
Michael Vogel
e50c0efcdf
Merge remote-tracking branch 'upstream/master'
2012-12-30 21:32:18 +01:00
Michael Vogel
ad287914c7
Support of "share" through the API.
2012-12-30 21:30:39 +01:00
Olaf Conradi
dbf8f711cf
Fix browser prefetch in notifications menu
...
Fix browser prefetch by substituting data-src with src for images
2012-12-30 00:28:48 +01:00
Olaf Conradi
94c8d7693f
Keep html in template, use data attribute for img
...
Revert previous changes to fix browser preloading a template variable as image.
Images use a data attribute within templates as src.
Javascript will substitute them.
2012-12-29 23:44:26 +01:00
Olaf Conradi
a41692120e
Also change acl stuff in the other themes
2012-12-28 23:51:40 +01:00
Olaf Conradi
239110a2bc
Change acl selection box templating
...
Keep dynamic templating in javascript so browsers don't
prefetch non-existing files.
2012-12-28 23:28:53 +01:00
Michael Vogel
6f6b1f95c8
vier: With IE there are no borders around images anymore
...
bbcode: Multiple new lines are now reduced
2012-12-28 11:31:30 +01:00
Zach Prezkuta
8066f2109e
update smarty templates
2012-12-27 12:23:37 -07:00
Zach Prezkuta
659ae4ed04
incremental improvements
2012-12-27 12:20:47 -07:00
Zach Prezkuta
b6981768ee
remove more dashes in templates
2012-12-27 09:38:42 -07:00
Michael Vogel
763504f0d5
Vier: Now the language of a post is shown
2012-12-27 01:05:59 +01:00
friendica
e189e6582a
fix profile_vcard all themes
2012-12-26 13:38:08 -08:00
friendica
792b4f63e7
remove dashes from variable names in profile_vcard.tpl
2012-12-26 13:20:18 -08:00
Zach Prezkuta
263fe0f6bc
revert unnecessary variable name changes
2012-12-26 10:42:01 -07:00
Zach Prezkuta
189c8ccf6f
some missed templates
2012-12-25 12:28:24 -07:00
Zach Prezkuta
e736abd372
small fixes; update smarty3 templates
2012-12-25 12:05:46 -07:00
Zach Prezkuta
11c06e21b7
simplify by making Smarty include directives behave like Friendica native ones
2012-12-25 11:55:57 -07:00
Michael Vogel
5bc6896671
The caches are now cleared only once an hour.
2012-12-25 12:52:30 +01:00
fermionic
6603758a5e
Merge pull request #558 from fermionic/20121222-use-smarty-template-engine
...
fix a few more templates for correct conversion to Smarty3 templates
2012-12-24 07:47:06 -08:00
Zach Prezkuta
ce445a385f
fix a few more templates for correction conversion to Smarty3 templates
2012-12-24 08:44:26 -07:00
Zach Prezkuta
f0bc8aa1dc
change field_*.tpl to * in some missed templates
2012-12-24 07:05:42 -07:00
Michael Vogel
bbec7a1ed9
Vier: added template for vcard
2012-12-24 12:41:00 +01:00
friendica
685a677bc9
Merge pull request #555 from annando/master
...
Vier: Changed buttons
2012-12-24 03:22:43 -08:00
Michael Vogel
e0df845fa3
Vier: Changed the buttons to a flat style that suites more the style of "vier"
2012-12-24 11:07:51 +01:00
4cae1fea81
DE: update to the strings
2012-12-24 09:34:47 +01:00
fermionic
80ea740cca
Merge pull request #554 from fermionic/20121222-use-smarty-template-engine
...
couple more places where file_get_contents was used
2012-12-23 18:30:45 -08:00
Zach Prezkuta
fdd9ed7e51
couple more places where file_get_contents was used
2012-12-23 19:29:19 -07:00
fermionic
1392c58377
Merge pull request #552 from annando/master
...
Vier: Forgotten CSS file and some more design changes
2012-12-23 17:16:20 -08:00
Michael Vogel
6649cb8e1a
Vier: New CSS file adde that acts like a translator between font awesome and the friendica classes
2012-12-23 23:54:28 +01:00
fermionic
974f60d132
Merge pull request #551 from fermionic/20121222-use-smarty-template-engine
...
20121222 use smarty template engine
2012-12-23 05:31:11 -08:00
Zach Prezkuta
232deadfd2
missed a couple more template engine assignments
2012-12-23 06:29:58 -07:00
fermionic
a0d7f7a6d3
Merge pull request #550 from fermionic/20121222-use-smarty-template-engine
...
only use Smarty if the view/smarty3/ directory is writable
2012-12-23 05:19:02 -08:00
Zach Prezkuta
53a4cf5339
only use Smarty if the view/smarty3/ directory is writable; location bug fix
2012-12-23 06:16:35 -07:00
Michael Vogel
3a32372ffa
vier: Problems with firefox on small displays fixed
2012-12-23 10:58:04 +01:00
Michael Vogel
ed4eaed7e0
Vier: Content is now aligned left - like before.
2012-12-23 10:47:12 +01:00
Michael Vogel
2e83034fc3
Vier: Background color of popup menus changed
2012-12-23 10:31:46 +01:00
friendica
a29842e301
Merge https://github.com/annando/friendica into annando
...
Conflicts:
view/admin_site.tpl
2012-12-22 23:02:21 -08:00
Michael Vogel
4b240c9109
vier: Changed color of sidebar links, made the content centered.
2012-12-23 03:26:29 +01:00
Zach Prezkuta
96ed0a7791
Implement Smarty3
2012-12-22 12:57:29 -07:00
Michael Vogel
b0759e9a9f
Some more system settings are now reachable via front-end
...
Bugfixing in the mail import when a reply header isn't set correctly
2012-12-22 16:16:01 +01:00
Michael Vogel
99ca867869
The performance settings and other systems settings (lock file path, temp path) can now be set via the front end.
2012-12-21 18:23:55 +01:00
Michael Vogel
34128925dc
"vier": Now the search results containing a link to the original thread
2012-12-21 15:03:22 +01:00
Michael Vogel
61b51d40e7
Vier: disabling the "community" works now
2012-12-21 13:13:22 +01:00
5cedd3430f
CS: update to the strings
2012-12-21 13:10:03 +01:00
e441f3286c
DE: update to the strings
2012-12-21 13:09:33 +01:00
Michael Vogel
d7073f7884
Vier: All optical glitches should be removed now.
2012-12-21 13:02:39 +01:00
Michael Vogel
293a794973
"vier": More icons replaced
2012-12-21 03:53:07 +01:00
Michael Vogel
7c7d3fe5de
"share" - now the attribut value for the "author" is escaped
2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3
New option to enable and disable the "share" element
...
Changes to "vier" to use more "font awesome" icons
2012-12-21 00:08:58 +01:00
Michael Vogel
8e194cb411
Vier: switching some more icons to "font awesome"
2012-12-20 12:13:37 +01:00
friendica
898f68938a
Merge pull request #546 from annando/master
...
Bugfix in mail import - use of the "share" element in ostatus and diaspora items
2012-12-19 22:54:53 -08:00
Michael Vogel
a8aa992102
Vier: Design issues with preview fixed
2012-12-20 04:19:02 +01:00
Michael Vogel
330960f8f7
Vier: Now there are buttons for inserting bbcode elements in the comments
2012-12-20 03:33:36 +01:00
Olaf Conradi
d9d7eb89ed
Fix alignment of photo menu
...
Remove duplicate definitions
Align menu button to be exactly the same width as the photo
2012-12-19 19:15:39 +01:00
Olaf Conradi
ee5d2acd42
Fix alignment of location
2012-12-19 19:04:18 +01:00
Olaf Conradi
98c5b6e73b
Text box alignment in Smoothly theme
...
Make sure comment text boxes stay within their surrounding box.
2012-12-19 18:27:50 +01:00
Michael Vogel
a86baa372a
Mailimport is now realized like a wall-to-wall-post
2012-12-19 15:58:38 +01:00
Michael Vogel
cb3586a280
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
view/de/strings.php
2012-12-19 12:24:02 +01:00
Michael Vogel
c22f65bafa
repeated items from ostatus and diaspora are now using the share-element.
...
Some design changes to repeated items in "vier".
2012-12-19 12:18:52 +01:00
friendica
ecc55221af
Merge pull request #545 from annando/master
...
New bbcode: "share", caching of photos and some changes to "vier"
2012-12-19 03:13:42 -08:00
Michael Vogel
4164257cb2
vier: The alt-pager and the birthday- and eventreminder is optically improved
2012-12-17 21:12:11 +01:00
a8df4cf04b
PL: update to the strings
2012-12-17 11:14:26 +01:00
1353e8ef4c
DE: update to the strings
2012-12-17 11:11:32 +01:00
Michael Vogel
a6b1275f16
Merge remote-tracking branch 'upstream/master'
2012-12-17 10:32:53 +01:00
Michael Vogel
9c0de28622
bbcode: New element "share" for shared content
...
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
2012-12-17 03:01:40 +01:00
Michael Vogel
d253d59668
vier: Added Delegations and optical changes.
2012-12-15 14:39:37 +01:00
Michael Vogel
a61ac769a0
vier: Expanding and collapsing now works
2012-12-15 11:25:52 +01:00
friendica
6faadc9662
anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported.
2012-12-13 14:15:18 -08:00
friendica
4793ebb141
change profile photo link on profile edit page
2012-12-07 16:02:40 -08:00
5a634f3d9b
NB_NO: update to the strings
2012-12-04 11:09:48 +01:00
62d4034a5a
RU: update to the strings
2012-12-04 11:06:02 +01:00
fc8c01750b
PT-BR: update to the strings
2012-12-04 11:03:23 +01:00
71054f1483
RU: update to the strings
2012-12-03 09:35:07 +01:00
23c873fc51
Merge pull request #542 from annando/master
...
Some minor changes to "vier"
2012-12-02 23:49:06 -08:00
Michael Vogel
5635fe250c
Merge remote-tracking branch 'upstream/master'
2012-12-03 08:30:49 +01:00
Michael Vogel
d548d1943f
vier: maximum width of comments defined
2012-12-03 08:29:41 +01:00
Vasya Novikov
480af990ec
added translations where they were empty
2012-12-03 00:14:34 +04:00
daa56a94d3
DE: update to the strings
2012-11-30 09:17:58 +01:00
af1ebc932f
FR: update to the strings
2012-11-30 09:17:29 +01:00
Thomas Willingham
785fa1e070
Remove unsupported tag from Darkzero-NS since I have been supporting it.
2012-11-29 02:33:11 +00:00
Thomas Willingham
512729073b
Unmark Diabook experimental
2012-11-27 17:14:13 +00:00
Thomas Willingham
8c3ea4b4d4
Add max_daily_registrations to admin panel.
2012-11-27 17:13:32 +00:00
Thomas Willingham
7de455602c
Revert Diabook.
2012-11-27 16:28:12 +00:00
Thomas Willingham
95322ff5f4
Diabook - of all the things to miss...wall-item-content.
2012-11-26 05:49:13 +00:00
Thomas Willingham
fa5d25ec7a
Diabook - better 1024 resolution support.
2012-11-26 04:38:19 +00:00
Thomas Willingham
b0b4baa331
Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list.
2012-11-26 02:11:19 +00:00
54bcfd2535
PL: update to the strings
2012-11-25 12:57:55 +01:00
50aa5face7
DE: update to the strings
2012-11-25 12:57:28 +01:00
ae58049110
ZH-CN: Update to the strings
2012-11-25 12:52:18 +01:00
Michael Vogel
88f5865738
Vier: Maximum with for content area
2012-11-23 12:15:03 +01:00
friendica
226d1ba7c1
Merge pull request #537 from fermionic/20121121-features
...
Port Features from Red
2012-11-22 20:54:16 -08:00
Zach Prezkuta
04f5506318
forgot some slightly important files
2012-11-22 09:20:03 -07:00
Zach Prezkuta
94204d9160
implement features
2012-11-22 09:14:22 -07:00
Michael Vogel
e36c30d285
Vier: Margin problems with code fixed.
2012-11-22 15:06:15 +01:00
c40740d19f
ZH-CN: Update to the strings
2012-11-20 17:26:54 +01:00
Thomas Willingham
7139e60b94
Diabook - fix wall-to-wall posts
2012-11-19 15:58:50 +00:00
Thomas Willingham
1a5d4f91cd
Diabook red. All that's left to do now is...all sorts of other things.
2012-11-18 23:30:48 +00:00
Thomas Willingham
f644cbb30b
Diabook pink
2012-11-18 22:52:44 +00:00
Thomas Willingham
a7982caf71
Diabook - should probably add *all* the files...
2012-11-18 22:06:53 +00:00
Thomas Willingham
96633cb0e5
Diabook - kill thousands more lines. Two more to go then we can start on the bugs...
2012-11-18 22:06:02 +00:00
Thomas Willingham
589f3603ae
Diabook - grep replace missed this
2012-11-18 21:27:02 +00:00
f9fbab948e
ZH-CN: initial pieces of the Chinese (China) translation. Thx to matthew_exon
2012-11-18 20:10:05 +01:00
Michael Vogel
c0376339e0
Merge remote-tracking branch 'upstream/master'
2012-11-17 14:29:09 +01:00
Michael Vogel
f17377e6de
New cache system with subdirectories
2012-11-17 00:50:39 +01:00
Thomas Willingham
3f9eef1ef6
Diabook - some more heavy lifting.
2012-11-16 22:29:39 +00:00
94a16f23c4
DE: update to the strings
2012-11-16 09:58:00 +01:00
Thomas Willingham
c12a27c73c
More diabook...
2012-11-16 02:49:05 +00:00
Thomas Willingham
da2aabd61d
Diabook - couple of fixes.
2012-11-16 01:58:28 +00:00
Thomas Willingham
bb86214698
Add the event/birthday thing from Andreas.
2012-11-16 01:44:09 +00:00
Thomas Willingham
da1b4939f0
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-16 00:37:53 +00:00
Thomas Willingham
b19c832381
Diabook. Get the paths right. There seems to be something in the PHP putting us in unexpected directories...but it works now.
2012-11-16 00:36:52 +00:00
Thomas Willingham
09150cb5dc
Diabook - some heavy lifting. Lots more still to do.
2012-11-15 23:54:13 +00:00
Michael Vogel
e67062d9cf
Merge remote-tracking branch 'upstream/master'
2012-11-15 21:52:35 +01:00
Michael Vogel
fce18fd223
Vier: New Icon set
2012-11-15 21:47:36 +01:00
Michael Vogel
ff5ab7e9c6
Vier: Further improvements.
2012-11-15 08:18:25 +01:00
pixelroot
a00723fb9c
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_thread.tpl
2012-11-14 20:10:08 +01:00
pixelroot
7c4e3984be
new file: view/theme/smoothly/search_item.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_thread.tpl
2012-11-14 11:43:26 +01:00
Thomas Willingham
6fd47ba78e
Even shinier Dispy.
2012-11-14 03:01:15 +00:00
Thomas Willingham
79f35d01a7
"Everything" now includes Vier
2012-11-13 16:21:03 +00:00
Thomas Willingham
4c6401cfb0
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-13 15:52:16 +00:00
4b5dea5c89
Update view/pl/strings.php
2012-11-13 16:52:18 +01:00
Thomas Willingham
13ffe6274c
Everything is shiny (except frost and smoothly).
2012-11-13 15:50:48 +00:00
pixelroot
7e16909d0e
deleted: view/theme/smoothly/events_reminder.tpl
2012-11-13 16:37:53 +01:00
pixelroot
0e2fdee20e
modified: view/theme/smoothly/jot-header.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-11-13 16:36:36 +01:00
fabrixxm
ce12b3d2f0
Merge pull request #535 from fabrixxm/master
...
fix \"" issue in util/po2php.php
2012-11-13 07:16:22 -08:00
Fabrixxm
7093c1b9f6
update all languages strings.php
2012-11-13 10:13:28 -05:00
9886139d71
PL: update to the strings
2012-11-13 15:39:07 +01:00
fabrixxm
5a2c01d572
Merge pull request #532 from fabrixxm/quattrofixs
...
template: new $item.shiny; some fix to quattro
2012-11-13 03:08:26 -08:00
Fabrixxm
d40099e97c
add $item.shiny to default template
2012-11-12 12:55:18 -05:00
Fabrixxm
f3716d51ef
quattro: fix tag item template
...
add correct initial and final divs
2012-11-12 12:45:49 -05:00
pixelroot
9f09955925
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
2012-11-12 15:35:16 +01:00
pixelroot
8395966cf2
modified: view/theme/smoothly/css/typography.css
...
new file: view/theme/smoothly/screenshot.png
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-11-12 15:01:19 +01:00
Michael Vogel
30e429e6ce
Vier: Changed the color of links and notification counter.
2012-11-12 08:22:49 +01:00
Michael Vogel
b6b85b9773
Vier: Colors of links changed
2012-11-12 00:38:45 +01:00
Thomas Willingham
4c3e9fde28
Diabook - move pause icon.
2012-11-11 18:44:13 +00:00
Thomas Willingham
fccc76371f
Move the language selector.
2012-11-11 18:42:35 +00:00
Thomas Willingham
1a884e4065
Diabook - an out of date buglink probably shouldn't be in the navigation.
2012-11-11 18:39:16 +00:00
Thomas Willingham
9ea96c74a2
Diabook - remove jquery that seems to do nothing except break ACL in 90% of all browsers.
2012-11-11 18:31:11 +00:00
Thomas Willingham
8b961b0a39
Diabook - yeah, we're supposed to *stop* duplicating code...
2012-11-11 17:49:41 +00:00
Thomas Willingham
4bd70c15db
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-11 15:46:04 +00:00
Thomas Willingham
10e84c548c
Diabook threaded comments.
2012-11-11 15:44:36 +00:00
f28b49e6d8
PL: update to the strings
2012-11-11 10:56:07 +01:00
c88e7d75c0
CS: update to the strings
2012-11-11 10:55:47 +01:00
Michael Vogel
197a12adb5
Vier: Further design improvements
2012-11-11 00:39:08 +01:00
Michael Vogel
b875191237
Diaspora: Avatars of repeated items weren't found
...
Vier: Complete redesign of the navigation header
2012-11-10 23:19:32 +01:00
7187107034
glitch with DE, PL strings
2012-11-10 08:50:26 +01:00
286578542f
DE: update to the strings
2012-11-10 08:37:21 +01:00
85feaa1a8d
PL: update to the strings
2012-11-10 08:36:43 +01:00
Michael Vogel
71e43e68d4
Merge remote-tracking branch 'upstream/master'
2012-11-09 23:40:17 +01:00
Fabrixxm
ff659a822b
add apple/gnome web app tags
2012-11-09 13:23:47 -05:00
Fabrixxm
b15352f650
quattro: collapse threaded comment box
2012-11-09 11:58:35 -05:00
Fabrixxm
c8b4ce9cca
quattro: fix shiny items with threads. fix 'tagged' template
2012-11-09 11:24:49 -05:00
Michael Vogel
fb02d72a35
vier: toggle comments only with threaded comments
2012-11-09 08:01:16 +01:00
friendica
f71db67a36
Merge https://github.com/friendica/friendica into pull
2012-11-08 20:47:04 -08:00
friendica
4199f49b54
remember me to base theme
2012-11-08 20:46:44 -08:00
fermionic
a6c05b5186
Merge pull request #530 from fermionic/20121108-dispy-menu-fix
...
fix help button position in dispy
2012-11-08 18:16:01 -08:00
Michael Vogel
b41687e209
"vier": Button for show/hide of text area for comments
2012-11-09 01:56:51 +01:00
Zach Prezkuta
36a9b2ed9a
fix help button position
2012-11-08 17:50:37 -07:00
friendica
824dcb8e76
Merge pull request #529 from fermionic/20121107-remember-me
...
add ability to remember logged in user after browser closes
2012-11-08 16:29:02 -08:00
Michael Vogel
b14e557575
Vier: Fixing "vier" so that it looks again like it was intended.
2012-11-09 01:19:24 +01:00
Michael Vogel
4196b6a96c
Merge remote-tracking branch 'upstream/master'
2012-11-08 21:44:17 +01:00
225fd777fd
PL: added Polish localization. Tha to Adam Jurkiewicz and the rest of the translation team :-)
2012-11-08 18:54:42 +01:00
815d48e5e4
frost-mobile: on subdirectory installs the login screen image was not found
2012-11-08 06:48:49 +01:00
Zach Prezkuta
e116712bf5
add ability to remember logged in user after browser closes
2012-11-07 18:59:30 -07:00
Zach Prezkuta
bff31a49eb
leaked local change
2012-11-06 08:49:03 -07:00
Zach Prezkuta
999c3439e6
fix mobile photo uploads; better theme control; frost improvements
2012-11-06 08:43:19 -07:00
Fabrixxm
5b4944fe8e
Merge remote-tracking branch 'remotes/friendica/master' into moveme
2012-11-05 09:37:58 +01:00
Fabrixxm
aa20042bec
moveme: fix contact photos
2012-11-05 09:18:55 +01:00
2093fa8b3f
DE: update to the strings
2012-11-05 07:29:55 +01:00
Michael
ff40442768
Restoring the community pages in diabook
2012-11-05 00:20:32 +01:00
Zach Prezkuta
c9248b66db
display live update; don't collapse comments on live update
2012-11-01 18:31:50 -06:00
Zach Prezkuta
6effdd570c
add a confirm dialog and a busy rotator for delete selected
2012-11-01 17:42:40 -06:00
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
c177a5e5b2
vier: threads
2012-11-01 15:05:31 +01:00
9086641fd1
ES: update to the strings
2012-11-01 13:12:54 +01:00
4832bc74f5
FR: update to the strings
2012-11-01 13:03:25 +01:00
Fabrixxm
1a3a5ee8d9
moveme: first successful relocated user
2012-10-31 17:13:45 +01:00
70f8a69ef3
IT: update to the strings
2012-10-31 07:42:23 +01:00
Zach Prezkuta
2bfacda2df
missed quattro threaded_conversation live update field
2012-10-29 13:04:59 -06:00
Zach Prezkuta
4fa5b76167
delete template files that are identical to the defaults
2012-10-29 12:56:17 -06:00
Fabrixxm
dbc6cbe024
moveme: send and receive DFRN "relocate" message (WIP)
2012-10-29 17:50:55 +01:00
Fabrixxm
c51e057fe6
Merge remote branch 'friendica/master' into moveme
2012-10-29 05:57:58 -04:00
pixelroot
c1299bc689
view/theme/smoothly/screenshot.png
2012-10-25 13:50:26 +02:00
pixelroot
8e9c9992b0
new file: view/theme/smoothly/images/arrow.png
...
new file: view/theme/smoothly/images/calendar.png
new file: view/theme/smoothly/images/connect.png
new file: view/theme/smoothly/images/dot.png
new file: view/theme/smoothly/images/down.png
new file: view/theme/smoothly/images/file.gif
new file: view/theme/smoothly/images/groups.png
new file: view/theme/smoothly/images/icons.png
new file: view/theme/smoothly/images/icons.svg
new file: view/theme/smoothly/images/login-bg.gif
new file: view/theme/smoothly/images/lrarrow.gif
new file: view/theme/smoothly/images/menu-user-pin.jpg
new file: view/theme/smoothly/images/menu-user-pin.png
new file: view/theme/smoothly/images/nav-bg.png
new file: view/theme/smoothly/images/next.png
new file: view/theme/smoothly/images/notifications.png
new file: view/theme/smoothly/images/photo-menu.jpg
new file: view/theme/smoothly/images/photography.png
new file: view/theme/smoothly/images/premium.png
new file: view/theme/smoothly/images/prev.png
new file: view/theme/smoothly/images/search.png
new file: view/theme/smoothly/images/shiny.png
new file: view/theme/smoothly/images/star.png
new file: view/theme/smoothly/images/tobottom.png
new file: view/theme/smoothly/images/totop.png
new file: view/theme/smoothly/images/user.png
2012-10-25 12:27:05 +02:00
pixelroot
272cccb47f
deleted: view/theme/smoothly/arrow.png
...
deleted: view/theme/smoothly/calendar.png
deleted: view/theme/smoothly/connect.png
modified: view/theme/smoothly/css/typography.css
deleted: view/theme/smoothly/dot.png
deleted: view/theme/smoothly/down.png
deleted: view/theme/smoothly/file.gif
deleted: view/theme/smoothly/groups.png
deleted: view/theme/smoothly/icons.png
deleted: view/theme/smoothly/icons.svg
deleted: view/theme/smoothly/login-bg.gif
deleted: view/theme/smoothly/lrarrow.gif
deleted: view/theme/smoothly/menu-user-pin.jpg
deleted: view/theme/smoothly/menu-user-pin.png
deleted: view/theme/smoothly/nav-bg.png
modified: view/theme/smoothly/nav.tpl
deleted: view/theme/smoothly/nets.tpl
deleted: view/theme/smoothly/next.png
deleted: view/theme/smoothly/notifications.png
deleted: view/theme/smoothly/photo-menu.jpg
deleted: view/theme/smoothly/photo_album.tpl
deleted: view/theme/smoothly/photo_top.tpl
deleted: view/theme/smoothly/photo_view.tpl
deleted: view/theme/smoothly/photography.png
deleted: view/theme/smoothly/premium.png
deleted: view/theme/smoothly/prev.png
deleted: view/theme/smoothly/profile_entry.tpl
deleted: view/theme/smoothly/profile_vcard.tpl
deleted: view/theme/smoothly/saved_searches_aside.tpl
deleted: view/theme/smoothly/screenshot.png
deleted: view/theme/smoothly/search.png
deleted: view/theme/smoothly/search_item.tpl
deleted: view/theme/smoothly/shiny.png
deleted: view/theme/smoothly/star.png
2012-10-25 12:26:09 +02:00
Simon L'nu
00ee068b65
fix for preview post thingy blocking the posting buttons
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-10-25 02:59:49 -04:00
Simon L'nu
1d9633b0cc
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Friendicaland - remove states no longer flying the Friendica banner.
deleted: view/theme/smoothly/categories_widget.tpl deleted: view/theme/smoothly/contact_template.tpl deleted: view/theme/smoothly/footer.tpl deleted: view/theme/smoothly/generic_links_widget.tpl deleted: view/theme/smoothly/group_drop.tpl deleted: view/theme/smoothly/group_side.tpl deleted: view/theme/smoothly/header.tpl deleted: view/theme/smoothly/mail_head.tpl deleted: view/theme/smoothly/message_side.tpl deleted: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css
2012-10-25 02:11:38 -04:00
pixelroot
fa7157492a
deleted: view/theme/smoothly/categories_widget.tpl
...
deleted: view/theme/smoothly/contact_template.tpl
deleted: view/theme/smoothly/footer.tpl
deleted: view/theme/smoothly/generic_links_widget.tpl
deleted: view/theme/smoothly/group_drop.tpl
deleted: view/theme/smoothly/group_side.tpl
deleted: view/theme/smoothly/header.tpl
deleted: view/theme/smoothly/mail_head.tpl
deleted: view/theme/smoothly/message_side.tpl
deleted: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
2012-10-24 16:41:56 +02:00
pixelroot
c92e7a3521
modified: view/theme/smoothly/style.css
2012-10-24 14:04:57 +02:00
pixelroot
6d1614e8fa
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
2012-10-24 12:24:12 +02:00
Simon L'nu
cf42b6f78d
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (23 commits)
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php
Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
Diabook - first part of clean-up to make the theme maintainable.
modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/vcard-widget.tpl
rev update
modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/tobottom.png
modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php
IT: update to the strings
DE: update to the strings
new file: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php
DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
Friendicaland
undefined fn: init_groups_visitor in mod_profile, rev update
Diabook - remove redundant TPL to bring back all admin settings
CS: update to the strings
ES: update to the strings
FR: update to the strings
...
2012-10-24 05:41:11 -04:00
pixelroot
cc59cb2755
modified: view/theme/smoothly/style.css
2012-10-24 11:13:12 +02:00
pixelroot
fe4e6f05d7
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-10-24 10:33:39 +02:00
Thomas Willingham
a8084fa540
Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
2012-10-23 20:05:55 +01:00
Thomas Willingham
35a44d8d27
Diabook - first part of clean-up to make the theme maintainable.
2012-10-23 19:20:49 +01:00
pixelroot
e43097dbc1
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
2012-10-23 15:47:48 +02:00
pixelroot
136175047d
modified: view/theme/smoothly/profile_vcard.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
new file: view/theme/smoothly/vcard-widget.tpl
2012-10-23 14:23:28 +02:00
pixelroot
5f61290811
modified: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
2012-10-23 10:58:50 +02:00
pixelroot
f8787b6762
modified: view/theme/smoothly/default.php
...
modified: view/theme/smoothly/nav.tpl
modified: view/theme/smoothly/style.css
new file: view/theme/smoothly/tobottom.png
2012-10-23 10:22:39 +02:00
pixelroot
215f084a2e
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-10-23 09:24:19 +02:00
09a36fc05c
IT: update to the strings
2012-10-22 17:54:17 +02:00
b157a00c34
DE: update to the strings
2012-10-22 17:48:30 +02:00
pixelroot
e4ab5dd32f
new file: view/theme/smoothly/css/typography.css
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-10-22 16:53:56 +02:00
Thomas Willingham
05bfd3bbf7
DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
2012-10-22 01:49:35 +01:00
Thomas Willingham
1b9438120c
Diabook - remove redundant TPL to bring back all admin settings
2012-10-21 18:44:23 +01:00
298aeb5bf5
CS: update to the strings
2012-10-20 12:57:34 +02:00
64a0dc1eed
ES: update to the strings
2012-10-20 12:57:09 +02:00
50cf6c0797
FR: update to the strings
2012-10-20 12:56:47 +02:00
21ffccbe72
DE: update to the strings
2012-10-20 12:56:25 +02:00
pixelroot
5016a589fb
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-10-19 11:53:22 +02:00
friendica
2347a4326c
get rid of 'Friendika'
2012-10-18 21:51:45 -07:00
Simon L'nu
6ee4e4a93d
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
imagick exception
rev update
diabook: use proper defaults in popup sidebar config
diabook boxes: use a common hide/show form entry definition
remove lots of duplicated code in diabook config handling
2012-10-18 11:30:58 -04:00
Fabrixxm
65d235017c
move account. first step.
...
export basic account data as json
import basic account data in db (dbs must be at same schema version)
2012-10-17 11:13:01 -04:00
Thomas Willingham
2940f25df9
Merge pull request #514 from hmeine/master
...
Cleanups in diabook theme code
2012-10-16 09:05:50 -07:00
Hans Meine
ba503b9927
diabook: use proper defaults in popup sidebar config
2012-10-16 13:44:27 +02:00
Hans Meine
d0775be2e2
diabook boxes: use a common hide/show form entry definition
2012-10-16 13:42:18 +02:00
Hans Meine
2d614b6700
remove lots of duplicated code in diabook config handling
2012-10-16 13:33:53 +02:00
Simon L'nu
2c15bdd99e
merge HEAD
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-10-15 22:48:25 -04:00
f5a458d139
DE/FR/PT-BR: update to the strings
2012-10-13 09:38:47 +02:00
fermionic
2f3d118e77
Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
...
allow themes to decide where live updates appear
2012-10-10 17:34:28 -07:00
Zach Prezkuta
0d56f82efa
frost style improvements; various tweaks
2012-10-09 09:44:56 -06:00
Zach Prezkuta
0ea89852d2
allow themes to decide where live updates appear
2012-10-09 09:41:33 -06:00
c0c8869f89
CS: update to the strings
2012-10-09 08:23:52 +02:00
1fa88bb79e
DE/PT-BR: update to the strings
2012-10-06 10:43:14 +02:00
Thomas Willingham
ffe7209114
Darkzero - make "visible to" legible.
2012-10-06 01:18:03 +01:00
Zach Prezkuta
5f2826f84e
update themes for new All Networks option
2012-10-04 19:59:30 -06:00
Thomas Willingham
d33abe2de9
Dispy - selecting any network and then switching back to "all networks"
...
didn't work. Remove nets.tpl to make it use the default one.
2012-10-04 23:19:50 +01:00
pixelroot
ceb8b8b77f
new file: view/theme/smoothly/file.gif
...
modified: view/theme/smoothly/search_item.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-10-04 16:37:02 +02:00
ef9eec5561
DE: update to the strings
2012-10-04 10:33:49 +02:00
65b52878c4
CS: update to the strings
2012-10-03 09:00:59 +02:00
122cf96ffd
FR: update to the strings
2012-10-03 07:56:29 +02:00
d651291916
DE: update to the strings
2012-10-03 07:56:12 +02:00
Christian Vogeley
44acbb25e4
Bring back BB-Code in comments
2012-10-02 21:29:00 +02:00
Zach Prezkuta
e850e0c6d5
frost suport for categories and folder updates
2012-10-01 14:22:32 -06:00
fabrixxm
9d4fdee65d
Merge pull request #500 from fabrixxm/quattro-fontsoptions
...
Quattro fixes
2012-10-01 07:05:58 -07:00
Fabrixxm
c7a4c08081
quattro: fix jot "video link" tooltip
2012-10-01 09:59:55 -04:00
Fabrixxm
871f182414
quattro: add quattro-lilac to theme Makefile
2012-10-01 09:53:02 -04:00
Fabrixxm
ca34d89482
quattro: fix post tags style, add icons for mentions, folders and categories
2012-10-01 09:38:25 -04:00
Fabrixxm
9d738570ee
quattro: options for posts and textareas font size
2012-10-01 08:58:05 -04:00
friendica
a620d5d9f3
Merge pull request #493 from fermionic/toggle-mobile-all-themes
...
Toggle mobile all themes
2012-09-30 01:58:51 -07:00
friendica
b03edcd8e5
Merge pull request #499 from fermionic/network-remember-filters
...
Network view updates
2012-09-30 01:54:00 -07:00
db81050edd
IT: update to the strings
2012-09-30 09:07:14 +02:00
cacd28d045
deleted nb_NO folder manually
2012-09-30 09:01:40 +02:00
e476a7126c
should be nb-no
2012-09-30 08:52:40 +02:00
2e8ac578cc
RU: update to the strings
2012-09-30 08:49:16 +02:00
f547387ada
FR: update to the strings
2012-09-30 08:43:15 +02:00
f73df7d209
DE: update to the strings
2012-09-30 08:41:43 +02:00
4845aa229c
nb_NO: added from Transifex
2012-09-30 08:41:03 +02:00
Zach Prezkuta
421c72d10f
remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters
2012-09-29 17:56:50 -06:00
Zach Prezkuta
4c2dd162a4
add new template file
2012-09-29 17:51:39 -06:00
Zach Prezkuta
cee50502d3
toggle mobile on all themes; Frost updates
2012-09-29 17:47:47 -06:00
Fabrixxm
de076afd6b
quattro: update wall_thread.tpl to separate tags/mentions/folder/category display
2012-09-28 10:17:26 -04:00
Fabrixxm
574631c17a
Merge remote branch 'friendica/master' into quattro-fontsoptions
2012-09-28 10:06:00 -04:00
ce8b6c4285
FR: update to the strings
2012-09-28 06:44:30 +02:00
friendica
9337441491
class not id
2012-09-27 02:54:14 -07:00
friendica
d615f0b563
forumlist changes
2012-09-27 02:47:50 -07:00
44469afe86
added IS from transifex, kudos to axelt
2012-09-27 06:42:57 +02:00
0209edb25c
FR: update to the strings
2012-09-27 06:31:55 +02:00
1880ad40d9
CA: update to the strings
2012-09-27 06:30:37 +02:00
88642699e7
EO: update to the strings
2012-09-27 06:29:25 +02:00
5fb4ca346b
CS: update to the strings
2012-09-27 06:27:06 +02:00
7b7e3aab1f
ES: update to the strings
2012-09-27 06:24:49 +02:00
ce38e574a2
DE: update to the strings
2012-09-27 06:21:16 +02:00
friendica
4a8100a409
frost-mobile - everything is walltowall
2012-09-25 21:55:53 -07:00
friendica
2cacbdb9e7
Merge https://github.com/friendica/friendica into pull
2012-09-25 19:11:58 -07:00
friendica
e433f20cd8
sort out the 'delete selected' mess
2012-09-25 19:10:46 -07:00
pixelroot
75d65db785
Merge remote branch 'upstream/master'
2012-09-25 12:00:29 +02:00
pixelroot
0bf9ff5821
modified: view/theme/smoothly/events_reminder.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-25 11:59:58 +02:00
friendica
245d9f0aca
one template to rule them all
2012-09-25 01:31:48 -07:00
friendica
a798ef1a56
one template to rule them all
2012-09-24 21:43:03 -07:00
pixelroot
0592a9e3ca
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-24 16:07:41 +02:00
friendica
8df6f249fd
Merge https://github.com/friendica/friendica into pull
2012-09-24 01:31:23 -07:00
pixelroot
0834779405
Merge remote branch 'upstream/master'
2012-09-24 10:16:05 +02:00
pixelroot
05223cc325
modified: view/theme/smoothly/search_item.tpl
...
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_item.tpl
modified: view/theme/smoothly/wall_thread.tpl
modified: view/theme/smoothly/wallwall_item.tpl
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-24 10:15:31 +02:00
friendica
94f3aef1ea
allow a bit more height
2012-09-24 00:46:00 -07:00
friendica
316014e4ea
restore category/file display on dispy/diabook
2012-09-24 00:35:19 -07:00
pixelroot
c44d068adf
Merge branch 'master' of http://github.com/friendica/friendica
2012-09-24 08:46:25 +02:00
friendica
054f8edb59
zeros - theming for new categories/folder display
2012-09-23 19:22:48 -07:00
930169a8aa
DE: update to the strings
2012-09-22 08:42:07 +02:00
