Commit graph

741 commits

Author SHA1 Message Date
Dan Poltawski
80787633cc Merge branch 'wip-MDL-33486-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-07 13:10:41 +08:00
Eloy Lafuente (stronk7)
ee21ac5333 Merge branch 'wip-MDL-43398-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-02 02:50:34 +02:00
Marina Glancy
1e6e35e277 MDL-33486 wiki: allow searching individual wikis 2014-03-28 14:16:55 +08:00
Marina Glancy
2877a60763 MDL-35305 wiki: backup and restore files
Thanks to Tatsuya Shirai for the patch
2014-03-28 10:29:20 +08:00
Marina Glancy
d654a1e6d2 MDL-43398 wiki: remove extra Choose... option from select 2014-03-27 14:57:26 +08:00
Jerome Mouneyrac
ec7de91744 MDL-43398 Wiki: Choose... options cause SQL errors or seen inappropriate. 2014-03-27 14:57:08 +08:00
Eloy Lafuente (stronk7)
6d8f9d4756 Merge branch 'wip-MDL-32699-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-12 00:19:11 +01:00
Sam Hemelryk
509f371389 Merge branch 'wip-MDL-40721-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 14:22:41 +13:00
Marina Glancy
a2ae0a7643 MDL-44471 Revert "MDL-42238 mod_wiki: Alternate name sql update to wiki_print_recent_activity"
This reverts commit 6d3d9bd927.
2014-03-07 10:00:51 +08:00
Marina Glancy
cdd3ca573a MDL-40721 wiki: missing page->set_url() when restoring wiki 2014-03-07 09:58:23 +08:00
Marina Glancy
b7c751a60c MDL-32699 wiki: only edit capability is required to restore wiki revision 2014-03-07 09:58:05 +08:00
Marina Glancy
e6499fb8a4 MDL-39990 wiki: more detailed validation of view/edit access 2014-03-03 14:45:40 +08:00
Damyon Wiese
fa0016a8a2 Merge branch 'MDL-41646_26' of git://github.com/apsdehal/moodle into MOODLE_26_STABLE 2014-02-18 12:41:42 +08:00
Rossiani Wijaya
a3b0030e04 MDL-42339 - removed double formatting for set_title() and set_heading() 2014-02-05 15:40:25 +08:00
apsdehal
3a1ade2544 MDL-41646 Wiki: Removed unnecessary wiki_info class 2014-02-02 15:51:30 +05:30
Eloy Lafuente (stronk7)
8c75f05721 Merge branch 'MDL-43109_26' of https://github.com/mdikih/moodle into MOODLE_26_STABLE 2014-01-13 21:51:54 +01:00
Michael Dikih
79f0a612c4 MDL-43109: mod/wiki - When editing pages populate the default value for the tags input. 2013-12-10 14:17:17 +10:30
David Monllao
9f8ef4294a MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 15:53:55 +08:00
Andrew Nicols
40daab14a4 MDL-41030 JavaScript: Convert remaining YUI2 IO calls to YUI3 2013-12-06 15:53:47 +08:00
David Monllao
dad1bc64c5 MDL-42627 behat: Replacing calls to deprecated step
Switching to the selector-based ..in the "LOCATOR" "table_row"
2013-12-02 14:13:49 +08:00
David Monllao
addedcb142 MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
2013-11-26 13:00:24 +08:00
Damyon Wiese
005e784e22 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:41:59 +08:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Mary Evans
fe4848110a MDL-40244 forms: added setType() for groupinfo in forum and wiki 2013-11-06 12:23:18 +11:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Damyon Wiese
42fb49ae0b Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle 2013-11-04 11:53:40 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Mark Nelson
5311f38215 MDL-35146 mod_wiki: fixed variable typo and altered code to conform to Moodle guidelines 2013-10-28 12:28:03 +08:00
Anton Fletcher
19b2d3fa9c MDL-35146 mod_wiki: fixed issue where pages for deleted groups caused an error on restore 2013-10-28 12:28:03 +08:00
Marina Glancy
20dff4b97e MDL-42400 mod_wiki: data generator for wiki 2013-10-26 14:00:27 +11:00
Adrian Greeve
6d3d9bd927 MDL-42238 - mod_wiki: Alternate name sql update to wiki_print_recent_activity 2013-10-10 14:02:32 +08:00
Rossiani Wijaya
f7bfb405cb MDL-41288 wiki: fix missing .rtl class for deleting comment button and improve page display for deleting comment 2013-09-13 12:56:41 +08:00
Rossiani Wijaya
14cdc25731 MDL-41288 Wiki: add additional fix for heading level 2013-09-13 11:04:08 +08:00
Marina Glancy
341e2460cd MDL-41288 Bugfix of error occuring when subwiki is not set 2013-09-10 22:02:24 +10:00
Rossiani Wijaya
876c0ac382 MDL-41288 wiki: improve heading levels and styling 2013-09-10 14:08:34 +08:00
Brian King
831ca534f4 MDL-29004 Wiki: display images in printer-friendly view 2013-08-13 10:00:46 +02:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Damyon Wiese
0070cb8bca Merge branch 'MDL-40295' of git://github.com/rwijaya/moodle 2013-07-23 15:51:59 +08:00
Rossiani Wijaya
74eab231f7 MDL-40295 wiki mod: fix set_url() error for printer friendly page.
Additionally, fix wiki pagelayout for printing
2013-07-18 10:47:07 +08:00
Dan Poltawski
caf8d39b17 MDL-40604 wiki: fix use of print_container 2013-07-17 14:11:10 +08:00
Damyon Wiese
2f9aeafe5e Merge branch 'MDL-40524' of git://github.com/aolley/moodle 2013-07-16 11:24:06 +08:00
Matt Debus
cde6172df8 MDL-40524: mod_wiki: Display comments in order 2013-07-08 16:27:31 +09:30
Rossiani Wijaya
be27bd59d9 MDL-39815: wiki and glossary mods: update print icon and system print popup 2013-07-05 12:10:30 +08:00
Rossiani Wijaya
2d5fb2a678 MDL-39815 Add action to display the print windows on page load 2013-07-05 11:23:35 +08:00
Sam Hemelryk
7d7a6e3c20 Merge branch 'wip-MDL-26998-master' of git://github.com/abgreeve/moodle 2013-06-18 11:22:40 +12:00
Adrian Greeve
4a28ff88fb MDL-26998 - mod_wiki: the page_wiki class now stores the course module object. 2013-05-23 15:11:32 +08:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
David Monllao
5d7b6307b1 MDL-39586 behat: Closed list of stackeholders 2013-05-09 18:38:13 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00