friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6363 commits 1 branch 22 tags 59 MiB
Commit graph

6363 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica 764ee653ba Provide backend ability to poke as a comment rather than top-level post 2012-07-31 20:59:51 -07:00
Simon L'nu 0e7f6d1417 Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix /display bug; oembed audio bug; other tweaks
  Frost: reduce DOM elements by about 20%; other tweaks and fixes
  rev update
  errant div in events_reminder.tpl
  pass deleted flag to display
  rev update
  fix filer bug; some interface tweaks
  Update view/theme/frost/nav.tpl
  Update view/theme/frost-mobile/nav.tpl
  don't show birthday/event details on mobile devices
  rev update
  remove server-specific change
  update version of frost and frost-mobile
  Modify Javascript to improve page loading times
  rev update
  Friendicaland got bigger.
 2012-07-31 23:16:56 -04:00
friendica 08c9185a7e Merge https://github.com/friendica/friendica into pull 2012-07-31 18:02:41 -07:00
friendica 49ad9b355c rev update 2012-07-31 18:01:55 -07:00
friendica 0c36d5b3cf Merge pull request #418 from fermionic/reduce-frost-dom-elements 
Reduce frost dom elements
 2012-07-31 18:01:33 -07:00
Zach Prezkuta 885bb50f0d fix /display bug; oembed audio bug; other tweaks 2012-07-31 18:53:18 -06:00
Zach Prezkuta b522ffeea5 Frost: reduce DOM elements by about 20%; other tweaks and fixes 2012-07-31 08:00:50 -06:00
friendica 5c033dee77 Merge https://github.com/friendica/friendica into pull 2012-07-30 14:17:07 -07:00
friendica 5297d6ee75 Merge pull request #417 from fermionic/events-reminder-makes-format-wonky 
errant div in events_reminder.tpl
 2012-07-30 14:16:11 -07:00
friendica 27ee8620f9 rev update 2012-07-30 14:14:20 -07:00
Zach Prezkuta 72df6ff664 errant div in events_reminder.tpl 2012-07-30 07:59:08 -06:00
friendica efded40461 pass deleted flag to display 2012-07-30 00:49:48 -07:00
friendica 9b752b8a59 Merge https://github.com/friendica/friendica into pull 2012-07-29 15:36:01 -07:00
friendica ee802016ba Merge pull request #416 from fermionic/frost-tweaks 
fix filer bug; some interface tweaks
 2012-07-29 15:35:02 -07:00
friendica 299f9e3d9e rev update 2012-07-29 15:32:26 -07:00
Zach Prezkuta 067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
fermionic 4f13618b18 Merge pull request #414 from 23n/patch-1 
Update view/theme/frost-mobile/nav.tpl
 2012-07-29 12:36:22 -07:00
fermionic ec1580b82d Merge pull request #415 from 23n/patch-2 
Update view/theme/frost/nav.tpl
 2012-07-29 12:36:05 -07:00
23n 5b5e4b6cb7 Update view/theme/frost/nav.tpl 
moved identity/page management-link to system-menu
 2012-07-29 15:28:59 +03:00
23n 0f1b33a278 Update view/theme/frost-mobile/nav.tpl 
move identity management link to menu
 2012-07-29 15:07:52 +03:00
friendica 5e64bccd5c don't show birthday/event details on mobile devices 2012-07-28 17:48:33 -07:00
friendica fe19890c3c Merge https://github.com/friendica/friendica into pull 2012-07-28 16:13:25 -07:00
friendica 61115d7a07 rev update 2012-07-28 16:12:12 -07:00
friendica 52df143134 Merge pull request #413 from fermionic/improve-page-loading 
Modify Javascript to improve page loading times for Frost
 2012-07-28 16:08:44 -07:00
Zach Prezkuta 38d4df77c6 remove server-specific change 2012-07-28 10:14:28 -06:00
Zach Prezkuta 231b37217b update version of frost and frost-mobile 2012-07-28 10:03:56 -06:00
Zach Prezkuta 1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
friendica eafec44793 Merge https://github.com/friendica/friendica into pull 2012-07-27 17:53:35 -07:00
friendica 50e20a1494 rev update 2012-07-27 17:52:43 -07:00
Thomas Willingham 3f39e29e6e Friendicaland got bigger. 2012-07-28 01:16:09 +01:00
Simon L'nu ca4a731bc2 Merge branch 'master' of github.com:simonlnu/friendica 
* 'master' of github.com:simonlnu/friendica:
 2012-07-26 13:52:38 -04:00
Michael Vogel dc416e5887 Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow. 2012-07-26 07:38:51 +02:00
Simon L'nu c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet. 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:35:50 -04:00
Simon L'nu d0724812ee Merge remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  Fixed syntax error in usage of anonymous function.
  rev update
  quattro: add id to items container div needed to make commit 4c6a4321 work
  update head.tpl for dispy
  rev update
  use regular theme choosing logic if no mobile theme is specified
  Removed useless function
  disable tos and privacy links
  disable tos and privacy links
  Rplace spaces with undercores in tags
  Introducing Frost Mobile
  Introducing Frost
 2012-07-25 22:28:16 -04:00
Simon L'nu 794ae669ce fixes to cursor 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-07-25 22:28:09 -04:00
friendica 2e5c970cb1 Merge pull request #412 from rainulf/master 
Sending a pull request
 2012-07-25 19:03:58 -07:00
Rainulf Pineda 1573c10631 Fixed syntax error in usage of anonymous function. 2012-07-25 21:38:28 -04:00
friendica 6ac45f2f6f Merge https://github.com/friendica/friendica into pull 2012-07-25 15:55:30 -07:00
friendica b9f13400d9 rev update 2012-07-25 15:52:26 -07:00
Michael Vogel fc27edb6d7 network: Caching of images 2012-07-26 00:23:25 +02:00
Michael Vogel 6456c2484e scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY] 2012-07-25 23:40:23 +02:00
Michael f140a6da89 Further performance improvements 2012-07-25 22:50:06 +02:00
Michael Vogel 69b883829a Speed improvements in the database 2012-07-25 21:28:06 +02:00
fabrixxm 42e80a162b Merge pull request #411 from fabrixxm/master 
quattro: add id to items container div
 2012-07-25 05:16:48 -07:00
Fabrixxm 727c93cb8c quattro: add id to items container div 
needed to make commit 4c6a4321 work
 2012-07-25 08:12:21 -04:00
friendica db0b7c36ea Merge https://github.com/friendica/friendica into pull 2012-07-24 17:45:12 -07:00
friendica a6f006ff17 Merge pull request #410 from fermionic/broken-share-box-in-dispy 
update head.tpl for dispy
 2012-07-24 17:32:49 -07:00
Zach Prezkuta 2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica 00043f3f1e Merge https://github.com/friendica/friendica into pull 2012-07-24 17:25:36 -07:00
friendica f48e491ba0 rev update 2012-07-24 17:24:53 -07:00