Commit Graph

12377 Commits

Author SHA1 Message Date
Zach Copley
4b24f09ab4 Merge branch '1.0.x' into directory
* 1.0.x: (68 commits)
  Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one.
  Fix bad reference
  lost a </div> in input_forms
  neo is the default
  First version of 3cl theme neo.
  cleaner is the new default theme (for now)
  store reply_to notices as comment activity objects
  fix object errors with bookmark notices
  save the object type when saving a new bookmark notice
  ActivityObject uses Notice's object_type by default
  Notice saves its object type
  show correct notice in output
  UR FACE
  wrapper div for primary nav
  Revert "abstraction for starting and ending a menu"
  Revert "primarynav uses menustart and menuend"
  primarynav uses menustart and menuend
  abstraction for starting and ending a menu
  remove adminpanelnav from adminpanelaction module
  Input form switcher works
  ...
2011-03-07 12:37:51 -08:00
Brion Vibber
f4f4e7499f Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-07 12:20:11 -08:00
Brion Vibber
0c2289fb2f Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one. 2011-03-07 12:18:46 -08:00
Zach Copley
985ff92431 Fix bad reference 2011-03-07 12:10:34 -08:00
Evan Prodromou
b7a8863b27 lost a </div> in input_forms 2011-03-07 15:06:21 -05:00
Evan Prodromou
4c0a746831 neo is the default 2011-03-07 15:00:43 -05:00
Samantha Doherty
15686cdf56 First version of 3cl theme neo. 2011-03-07 14:43:06 -05:00
Evan Prodromou
0b95d68910 cleaner is the new default theme (for now) 2011-03-07 14:32:21 -05:00
Evan Prodromou
55b4303ea4 Merge branch '3cl' into 1.0.x 2011-03-07 14:30:30 -05:00
Evan Prodromou
e1d177de7e store reply_to notices as comment activity objects 2011-03-07 14:27:23 -05:00
Evan Prodromou
095e2a74d4 fix object errors with bookmark notices 2011-03-07 14:25:37 -05:00
Evan Prodromou
f5782e9e56 save the object type when saving a new bookmark notice 2011-03-07 14:25:05 -05:00
Evan Prodromou
6862f765f6 ActivityObject uses Notice's object_type by default 2011-03-07 14:21:16 -05:00
Evan Prodromou
32f4daf44d Notice saves its object type 2011-03-07 14:20:55 -05:00
Evan Prodromou
618a658985 show correct notice in output 2011-03-07 14:06:46 -05:00
Evan Prodromou
998733cdd4 UR FACE 2011-03-07 12:49:20 -05:00
Evan Prodromou
2272044ad1 wrapper div for primary nav 2011-03-07 12:42:51 -05:00
Evan Prodromou
b751ab70fb Revert "abstraction for starting and ending a menu"
This reverts commit b4f1281799.
2011-03-07 12:39:52 -05:00
Evan Prodromou
6ab7329e85 Revert "primarynav uses menustart and menuend"
This reverts commit 8e03c83a57.
2011-03-07 12:39:31 -05:00
Evan Prodromou
8e03c83a57 primarynav uses menustart and menuend 2011-03-07 12:37:07 -05:00
Evan Prodromou
b4f1281799 abstraction for starting and ending a menu 2011-03-07 12:36:45 -05:00
Evan Prodromou
876c7a42c8 remove adminpanelnav from adminpanelaction module 2011-03-07 12:36:04 -05:00
Evan Prodromou
7380f36d86 Merge branch 'microapp' of gitorious.org:~evan/statusnet/evans-mainline into microapp
Conflicts:
	lib/action.php
2011-03-07 05:02:26 -05:00
Evan Prodromou
cf1a4d8292 Input form switcher works
This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.

The input menu doesn't yet look like a nice set of tabs; it could use some love.
2011-03-07 04:57:49 -05:00
Evan Prodromou
7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00
Evan Prodromou
52952d13c0 first (non-working) move to microapp structure for bookmarks 2011-03-07 03:34:20 -05:00
Evan Prodromou
0c3d27046e move microapp.php to microappplugin.php 2011-03-07 03:34:20 -05:00
Evan Prodromou
a7b6f7a669 add a couple of methods to MicroAppPlugin 2011-03-07 03:34:20 -05:00
Evan Prodromou
1b5faf1c4e correct length and default value for object_type 2011-03-07 03:34:20 -05:00
Evan Prodromou
a0e2ebec8f add activity object type to notice 2011-03-07 03:34:20 -05:00
Evan Prodromou
97dc0260d9 first pass at microapp class 2011-03-07 03:34:20 -05:00
Zach Copley
00c14ffa88 Better instructions, and better empty search results messages. 2011-03-06 22:08:19 -08:00
Zach Copley
b3e3264a4d Merge branch '1.0.x' into directory
* 1.0.x:
  Localisation updates from http://translatewiki.net.
  * fix i18n and L10n issues. * update translator documentation. * remove superfluous whitespace.
2011-03-06 20:35:06 -08:00
Evan Prodromou
457d76c0ca submenu headers are <h3> elements 2011-03-06 17:32:26 -05:00
Evan Prodromou
b54a9f389c made the input-form switcher work, kinda 2011-03-06 17:27:03 -05:00
Evan Prodromou
17db6cce3d first (non-working) move to microapp structure for bookmarks 2011-03-06 16:33:36 -05:00
Siebrand Mazeland
7a9b989349 Localisation updates from http://translatewiki.net.
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
2011-03-06 02:52:28 +01:00
Evan Prodromou
7184036cf2 move microapp.php to microappplugin.php 2011-03-05 14:48:10 -05:00
Evan Prodromou
031f5a98f7 add a couple of methods to MicroAppPlugin 2011-03-05 14:47:37 -05:00
Siebrand Mazeland
e9933871e5 * fix i18n and L10n issues.
* update translator documentation.
* remove superfluous whitespace.
2011-03-05 17:03:12 +01:00
Zach Copley
1256181d36 Merge branch '1.0.x' into directory
* 1.0.x:
  * translator documentation updated. * superfluous whitespace removed. * small refactoring in noticeform.php to allow proper translator hints.
  * translator documntation updated * superfluous whitespace remove * minor L10n and i18n updates
  Cleanup & minification for migration to reusable notice form in inline replies. Yay!
  Work in progress: inline reply form reusing the main reply form now inserts the successful result more or less right
  style fixes for new notice form being reused in reply area
  Reusable notice form fixes for geolocation
  Loading the original form instead of faking up our own. Sorta works but not pretty :D
  Kill some more hardcoded ids...
  More hardcoded id cleanup in notice form...
  'link' to 'links' in feed document
2011-03-05 01:57:50 -08:00
Zach Copley
5d22f969a1 * Integrate search input box
* Fix ordering
2011-03-05 01:55:52 -08:00
Zach Copley
5f1a795b73 Add some other ways to order searches to the base search engine class 2011-03-05 01:54:47 -08:00
Zach Copley
7d76b55da1 fixup comments 2011-03-04 17:55:56 -08:00
Zach Copley
52df926b8d Only show profiles of local users 2011-03-04 17:25:58 -08:00
Siebrand Mazeland
a127ba78a8 * translator documentation updated.
* superfluous whitespace removed.
* small refactoring in noticeform.php to allow proper translator hints.
2011-03-05 00:24:19 +01:00
Siebrand Mazeland
b37e12ed34 * translator documntation updated
* superfluous whitespace remove
* minor L10n and i18n updates
2011-03-05 00:13:04 +01:00
Brion Vibber
2fa95144ed Cleanup & minification for migration to reusable notice form in inline replies. Yay! 2011-03-04 15:00:20 -08:00
Brion Vibber
a1002cc107 Work in progress: inline reply form reusing the main reply form now inserts the successful result more or less right 2011-03-04 14:58:30 -08:00
Brion Vibber
97532a093d style fixes for new notice form being reused in reply area 2011-03-04 14:30:30 -08:00