clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,308 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

6308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Domovoy 07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02: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
Domovoy 30d7db5e42 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 22:43:49 +02: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
Domovoy 7b2ca538c8 Fallback to the old behavior for unhandled conversations mode. 2012-07-29 21:11:19 +02:00
Domovoy 283e91cd6a Update the thr-parent field in the item table 2012-07-29 21:01:04 +02:00
Domovoy 56f0ee4915 Threaded items on profile page 2012-07-29 20:41:11 +02:00
Domovoy 3b330510ea Fixed misbehaviour in collapsing 2012-07-29 20:09:51 +02:00
Domovoy 2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy 25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy 8ea3087342 Collapsing is back for threaded comments. 
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
 2012-07-29 17:13:21 +02: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
Domovoy 10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02: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
Domovoy eaf0d04bfb Comment box is now inside the item. Makes it easier to know what we are commenting on. 2012-07-27 22:58:51 +02:00
Domovoy d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy 8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Domovoy 3484d3bc5f Merge branch 'master' of github.com:CyberDomovoy/friendica into threaded_items 2012-07-27 08:27:24 +02: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
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
fermionic 30f37c8b5c Merge pull request #409 from fermionic/display-settings-dont-work-on-mobile 
use regular theme choosing logic if no mobile theme is specified
 2012-07-24 17:15:15 -07:00
Zach Prezkuta 657347254f use regular theme choosing logic if no mobile theme is specified 2012-07-24 18:13:19 -06:00
friendica 57a75d240b Merge pull request #406 from fermionic/frost-theme 
Introducing Frost
 2012-07-24 15:28:16 -07:00
friendica cc0c4474c0 Merge pull request #407 from fermionic/frost-mobile 
Introducing Frost Mobile
 2012-07-24 15:27:49 -07:00
friendica d60a834906 Merge pull request #408 from CyberDomovoy/diaspora 
Replace spaces with undercores in tags when sending to diaspora
 2012-07-24 15:26:18 -07:00
Domovoy 50d1bdd902 Removed useless function 2012-07-24 17:32:13 +02:00
Zach Prezkuta 9378bc1375 disable tos and privacy links 2012-07-24 09:27:27 -06:00